Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily override the CAPI AWS provider image #1933

Merged
merged 2 commits into from Dec 8, 2022

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Dec 8, 2022

What this PR does / why we need it:
This allows OCP 4.13 clusters to work while we bump the CAPA dependency (and API version) in our code

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 8, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 8, 2022
ComponentImages: map[string]string{
// TODO: Remove this override when we update CAPA to match the master branch of openshift/cluster-api-provider-aws
// Currently, this image points to CAPA in OCP release 4.12.0-ec.5
"aws-cluster-api-controllers": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fe3b95dad471e6840e8f38624fcd0ee6cbc92503460fe7f3503e640e13402d3",
Copy link
Member

@bryan-cox bryan-cox Dec 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to use a multi-arch image here rather than an x86 only image?

Ex: quay.io/openshift-release-dev/ocp-release:4.12.0-rc.3-multi

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @bryan-cox yup, that makes sense, will update.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

This allows OCP 4.13 clusters to work while we bump the CAPA dependency (and API version) in our code
@sjenning
Copy link
Contributor

sjenning commented Dec 8, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 8, 2022
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD a4fbc63 and 2 for PR HEAD 9eb0b94 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 8, 2022

@csrwng: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 230a0fb into openshift:main Dec 8, 2022
@csrwng csrwng deleted the fix-capi-provider branch July 14, 2023 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants