Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.8.3 (3cced50) into main #553
Conversation
![cloud-team-rebase-bot[bot]](https://avatars.githubusercontent.com/u/74064623?s=60&v=4){kind=small}
The version of calico used in our e2e tests was 2 years old so this updates to the current latest version. This will help ensure that there are no issues with the latest version of calico. Signed-off-by: Richard Case <[email protected]>
…ot/cherry-pick-5459-to-release-2.8 [release-2.8] 🌱 chore: bump calico for e2e tests
…ot/cherry-pick-5458-to-release-2.8 [release-2.8] 🐛 fix(addons): avoid infinite reconciliation loop
openshift-ci
bot
added
the
needs-ok-to-test
|
Hi @cloud-team-rebase-bot[bot]. Thanks for your PR. I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/ok-to-test |
openshift-ci
bot
added
ok-to-test
|
/override ci/prow/security |
|
/test e2e-aws-serial-2of2 |
|
@damdo: /override requires failed status contexts, check run or a prowjob name to operate on.
Only the following failed contexts/checkruns were expected:
If you are trying to override a checkrun that has a space in it, you must put a double quote on the context. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
@damdo: Overrode contexts on behalf of damdo: ci/prow/security In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
This CAPA v2.8.3 patch release doesn't have kubernetes-sigs#5374 as that was merged upstream on April 10th and is going to land in v2.9.0. In the meanwhile though the rebasebot detected the PR got merged and so it is dropping it from this CAPA v2.8.3 rebase, even if it is not contained in that release. This is an issue with the rebasebot that we need to fix. cc. @RadekManak |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
cloud-team-bot
bot
force-pushed
the
rebase-bot-main
branch
2 times, most recently
from
2b90410 to
7b02837
Compare
cloud-team-bot
bot
force-pushed
the
rebase-bot-main
branch
2 times, most recently
from
170d9c7 to
4445941
Compare
cloud-team-bot
bot
force-pushed
the
rebase-bot-main
branch
from
4445941 to
4d7cc9a
Compare
# Conflicts: # .github/dependabot.yml # .github/workflows/dependabot.yml # OWNERS_ALIASES # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # .github/dependabot.yml
… image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-aws-cluster-api-controllers.yml
…Allows It modified version of the original UPSTREAM: <carry>: Only tag NetworkInterfaces in RunInstances if IAM Allows It, adapt to rebase to adapt it to the upstream code changes.
… image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-aws-cluster-api-controllers.yml
# Conflicts: # openshift/infrastructure-components.yaml
Signed-off-by: Nolan Brubaker <[email protected]>
… image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-aws-cluster-api-controllers.yml
cloud-team-bot
bot
force-pushed
the
rebase-bot-main
branch
from
4d7cc9a to
c053280
Compare
|
@cloud-team-rebase-bot[bot]: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
No description provided.