-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
CORS-3483: azure: Update CAPZ version to 1.15.1 #8488
Conversation
@rna-afk: This pull request references CORS-3483 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set. 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 openshift-eng/jira-lifecycle-plugin repository. |
Inspecting the vendored files, it does not look like this is including the changes from kubernetes-sigs/cluster-api-provider-azure#4792 If that PR did not make it into release 1.15.1, you can vendor the changes from master. If that is the case, you would need to build the infrastructure-components file yourself by running Also, only vendors the changes into the installer. You will also need to vendor for the controller binary in Finally, it would be good to include a commit that updates Don't hesitate to reach out if you have questions or get stuck at all. Bumping the providers is a chore. |
/override ci/prow/okd-images |
/approve |
@sadasu: Overrode contexts on behalf of sadasu: ci/prow/okd-images 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. |
Picked the latest main branch commit. Should fix things here @patrickdillon |
/cc |
/retest-required |
/approve cancel It appears more work needs to be done #8488 (comment) |
/retest-required |
cluster-api/providers/azure/go.mod
Outdated
sigs.k8s.io/yaml v1.4.0 // indirect | ||
) | ||
|
||
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.3 | ||
// replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a bad sign. We want the capi versions to match or we might stumble into a hard to find bug.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This version v1.6.3 is leftover installer code. This replace should match the upstream go.mod which is on a more manageable v1.7.2:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@patrickdillon it worries me that we're building against 1.7.2 but running capi 1.7.0: https://github.com/openshift/installer/blob/master/cluster-api/cluster-api/go.mod#L5. Might not be an issue... until it is. I'd rather we also bumped the installer capi binary to 1.7.2
@rna-afk could you also split this into 2 commits. One for the go.mod changes and another for all the vendoring updates. |
147566c
to
aa60357
Compare
@@ -2,7 +2,7 @@ module openshift/installer/cluster-api/providers/core | |||
|
|||
go 1.21 | |||
|
|||
require sigs.k8s.io/cluster-api v1.7.0 | |||
require sigs.k8s.io/cluster-api v1.7.2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. Let's just make sure we run tests for all capi providers to check this doesn't cause issues.
/test ? |
@r4f4: The following commands are available to trigger required jobs:
The following commands are available to trigger optional jobs:
Use
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. |
/test altinfra-e2e-azure-capi-ovn altinfra-e2e-gcp-capi-ovn altinfra-e2e-nutanix-capi-ovn altinfra-e2e-openstack-capi-ovn altinfra-e2e-vsphere-capi-ovn altinfra-e2e-powervs-capi-ovn |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAICT the providers have not been impacted by the capi bump to 1.7.2. I just left one more comment.
aa60357
to
0a308a8
Compare
/test altinfra-e2e-azure-capi-ovn altinfra-e2e-gcp-capi-ovn altinfra-e2e-nutanix-capi-ovn altinfra-e2e-openstack-capi-ovn altinfra-e2e-vsphere-capi-ovn altinfra-e2e-powervs-capi-ovn |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/retest |
/approve We also need:
in order to close CORS-3483. I'm fine with doing that in a separate PR. |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: patrickdillon 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 |
Created #8594 to set the |
Updating the version to the latest main commit of v1.15.1. Updated cluster api provider azure and the infra components file. Commit ID: 901863904deee498347e4e617bc53211e4079f73
Adding the vendored files changed in the update.
0a308a8
to
0e5dfbe
Compare
New changes are detected. LGTM label has been removed. |
/test altinfra-e2e-azure-capi-ovn altinfra-e2e-gcp-capi-ovn altinfra-e2e-nutanix-capi-ovn altinfra-e2e-openstack-capi-ovn altinfra-e2e-vsphere-capi-ovn altinfra-e2e-powervs-capi-ovn |
/retest |
@rna-afk: The following tests 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. |
PR needs rebase. 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. |
/close Replaced by #8627 |
@sadasu: Closed this PR. 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. |
Updating the CAPZ version to the latest 1.15.1.