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

CORS-3483: azure: Update CAPZ version to 1.15.1 #8488

Closed
wants to merge 2 commits into from

Conversation

rna-afk
Copy link
Contributor

@rna-afk rna-afk commented May 28, 2024

Updating the CAPZ version to the latest 1.15.1.

@rna-afk rna-afk changed the title azure: Update CAPZ version to 1.15.1 CORS-3483: azure: Update CAPZ version to 1.15.1 May 28, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 28, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented May 28, 2024

@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:

Updating the CAPZ version to the latest 1.15.1.

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.

@patrickdillon
Copy link
Contributor

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 make release-manifests

Also, only vendors the changes into the installer. You will also need to vendor for the controller binary in cluster-api/providers/azure

Finally, it would be good to include a commit that updates DisableExtensionOperations on the machines, so that we can test & leverage the updated functionality we will get by vendoring.

Don't hesitate to reach out if you have questions or get stuck at all. Bumping the providers is a chore.

@sadasu
Copy link
Contributor

sadasu commented May 29, 2024

/override ci/prow/okd-images

@sadasu
Copy link
Contributor

sadasu commented May 29, 2024

/approve

Copy link
Contributor

openshift-ci bot commented May 29, 2024

@sadasu: Overrode contexts on behalf of sadasu: ci/prow/okd-images

In response to this:

/override ci/prow/okd-images

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 29, 2024
@rna-afk
Copy link
Contributor Author

rna-afk commented Jun 5, 2024

Picked the latest main branch commit. Should fix things here @patrickdillon

@jhixson74
Copy link
Member

/cc

@openshift-ci openshift-ci bot requested a review from jhixson74 June 5, 2024 19:07
@jhixson74
Copy link
Member

/retest-required

@sadasu
Copy link
Contributor

sadasu commented Jun 6, 2024

/approve cancel

It appears more work needs to be done #8488 (comment)

@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2024
@rna-afk
Copy link
Contributor Author

rna-afk commented Jun 6, 2024

/retest-required

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
Copy link
Contributor

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.

Copy link
Contributor

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:

https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/901863904deee498347e4e617bc53211e4079f73/go.mod#L219-L222

Copy link
Contributor

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

@sadasu
Copy link
Contributor

sadasu commented Jun 7, 2024

@rna-afk could you also split this into 2 commits. One for the go.mod changes and another for all the vendoring updates.

@@ -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
Copy link
Contributor

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.

@r4f4
Copy link
Contributor

r4f4 commented Jun 10, 2024

/test ?

Copy link
Contributor

openshift-ci bot commented Jun 10, 2024

@r4f4: The following commands are available to trigger required jobs:

  • /test agent-integration-tests
  • /test altinfra-images
  • /test altinfra-periodics-images
  • /test aro-unit
  • /test e2e-agent-compact-ipv4
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-edge-zones-manifest-validation
  • /test e2e-aws-ovn-upi
  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-upi
  • /test e2e-gcp-ovn
  • /test e2e-gcp-ovn-upi
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-openstack-ovn
  • /test e2e-vsphere-ovn
  • /test e2e-vsphere-ovn-upi
  • /test gofmt
  • /test golint
  • /test govet
  • /test images
  • /test okd-images
  • /test okd-unit
  • /test okd-verify-codegen
  • /test openstack-manifests
  • /test shellcheck
  • /test terraform-images
  • /test terraform-verify-vendor
  • /test tf-lint
  • /test unit
  • /test verify-codegen
  • /test verify-vendor
  • /test yaml-lint

The following commands are available to trigger optional jobs:

  • /test altinfra-e2e-aws-custom-security-groups
  • /test altinfra-e2e-aws-ovn
  • /test altinfra-e2e-aws-ovn-fips
  • /test altinfra-e2e-aws-ovn-imdsv2
  • /test altinfra-e2e-aws-ovn-localzones
  • /test altinfra-e2e-aws-ovn-proxy
  • /test altinfra-e2e-aws-ovn-public-ipv4-pool
  • /test altinfra-e2e-aws-ovn-shared-vpc
  • /test altinfra-e2e-aws-ovn-shared-vpc-local-zones
  • /test altinfra-e2e-aws-ovn-shared-vpc-wavelength-zones
  • /test altinfra-e2e-aws-ovn-single-node
  • /test altinfra-e2e-aws-ovn-wavelengthzones
  • /test altinfra-e2e-azure-capi-ovn
  • /test altinfra-e2e-gcp-capi-ovn
  • /test altinfra-e2e-gcp-ovn-byo-network-capi
  • /test altinfra-e2e-gcp-ovn-secureboot-capi
  • /test altinfra-e2e-gcp-ovn-xpn-capi
  • /test altinfra-e2e-ibmcloud-capi-ovn
  • /test altinfra-e2e-nutanix-capi-ovn
  • /test altinfra-e2e-openstack-capi-ccpmso
  • /test altinfra-e2e-openstack-capi-ccpmso-zone
  • /test altinfra-e2e-openstack-capi-dualstack
  • /test altinfra-e2e-openstack-capi-dualstack-upi
  • /test altinfra-e2e-openstack-capi-dualstack-v6primary
  • /test altinfra-e2e-openstack-capi-externallb
  • /test altinfra-e2e-openstack-capi-nfv-intel
  • /test altinfra-e2e-openstack-capi-ovn
  • /test altinfra-e2e-openstack-capi-proxy
  • /test altinfra-e2e-powervs-capi-ovn
  • /test altinfra-e2e-vsphere-capi-multi-vcenter-ovn
  • /test altinfra-e2e-vsphere-capi-ovn
  • /test altinfra-e2e-vsphere-capi-static-ovn
  • /test altinfra-e2e-vsphere-capi-zones
  • /test azure-ovn-marketplace-images
  • /test e2e-agent-compact-ipv4-appliance-diskimage
  • /test e2e-agent-compact-ipv4-none-platform
  • /test e2e-agent-ha-dualstack
  • /test e2e-agent-sno-ipv4-pxe
  • /test e2e-agent-sno-ipv6
  • /test e2e-aws-overlay-mtu-ovn-1200
  • /test e2e-aws-ovn-edge-zones
  • /test e2e-aws-ovn-fips
  • /test e2e-aws-ovn-imdsv2
  • /test e2e-aws-ovn-proxy
  • /test e2e-aws-ovn-public-subnets
  • /test e2e-aws-ovn-shared-vpc-custom-security-groups
  • /test e2e-aws-ovn-shared-vpc-edge-zones
  • /test e2e-aws-ovn-single-node
  • /test e2e-aws-ovn-upgrade
  • /test e2e-aws-ovn-workers-rhel8
  • /test e2e-aws-upi-proxy
  • /test e2e-azure-ovn-resourcegroup
  • /test e2e-azure-ovn-shared-vpc
  • /test e2e-azurestack
  • /test e2e-azurestack-upi
  • /test e2e-crc
  • /test e2e-gcp-ovn-byo-vpc
  • /test e2e-gcp-ovn-xpn
  • /test e2e-gcp-secureboot
  • /test e2e-gcp-upgrade
  • /test e2e-gcp-upi-xpn
  • /test e2e-ibmcloud-ovn
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi-ovn
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-ovn-swapped-hosts
  • /test e2e-metal-ipi-ovn-virtualmedia
  • /test e2e-metal-single-node-live-iso
  • /test e2e-nutanix-ovn
  • /test e2e-openstack-ccpmso
  • /test e2e-openstack-ccpmso-zone
  • /test e2e-openstack-dualstack
  • /test e2e-openstack-dualstack-upi
  • /test e2e-openstack-externallb
  • /test e2e-openstack-nfv-intel
  • /test e2e-openstack-proxy
  • /test e2e-vsphere-ovn-upi-zones
  • /test e2e-vsphere-ovn-zones
  • /test e2e-vsphere-ovn-zones-techpreview
  • /test e2e-vsphere-static-ovn
  • /test okd-e2e-agent-compact-ipv4
  • /test okd-e2e-agent-ha-dualstack
  • /test okd-e2e-agent-sno-ipv6
  • /test okd-e2e-aws-ovn
  • /test okd-e2e-aws-ovn-upgrade
  • /test okd-e2e-gcp
  • /test okd-e2e-gcp-ovn-upgrade
  • /test okd-e2e-vsphere
  • /test okd-scos-images
  • /test tf-fmt

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-installer-master-altinfra-images
  • pull-ci-openshift-installer-master-altinfra-periodics-images
  • pull-ci-openshift-installer-master-aro-unit
  • pull-ci-openshift-installer-master-azure-ovn-marketplace-images
  • pull-ci-openshift-installer-master-e2e-aws-ovn
  • pull-ci-openshift-installer-master-e2e-azure-ovn
  • pull-ci-openshift-installer-master-e2e-azure-ovn-shared-vpc
  • pull-ci-openshift-installer-master-e2e-azurestack
  • pull-ci-openshift-installer-master-e2e-gcp-ovn
  • pull-ci-openshift-installer-master-e2e-gcp-ovn-byo-vpc
  • pull-ci-openshift-installer-master-e2e-gcp-ovn-xpn
  • pull-ci-openshift-installer-master-e2e-gcp-secureboot
  • pull-ci-openshift-installer-master-gofmt
  • pull-ci-openshift-installer-master-golint
  • pull-ci-openshift-installer-master-govet
  • pull-ci-openshift-installer-master-images
  • pull-ci-openshift-installer-master-okd-unit
  • pull-ci-openshift-installer-master-okd-verify-codegen
  • pull-ci-openshift-installer-master-shellcheck
  • pull-ci-openshift-installer-master-tf-fmt
  • pull-ci-openshift-installer-master-tf-lint
  • pull-ci-openshift-installer-master-unit
  • pull-ci-openshift-installer-master-verify-codegen
  • pull-ci-openshift-installer-master-verify-vendor
  • pull-ci-openshift-installer-master-yaml-lint

In response to this:

/test ?

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.

@r4f4
Copy link
Contributor

r4f4 commented Jun 10, 2024

/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

Copy link
Contributor

@r4f4 r4f4 left a 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.

cluster-api/providers/azure/go.mod Outdated Show resolved Hide resolved
cluster-api/providers/azure/go.mod Outdated Show resolved Hide resolved
@rna-afk
Copy link
Contributor Author

rna-afk commented Jun 11, 2024

/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

Copy link
Contributor

@r4f4 r4f4 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2024
@rna-afk
Copy link
Contributor Author

rna-afk commented Jun 13, 2024

/retest

@patrickdillon
Copy link
Contributor

patrickdillon commented Jun 13, 2024

/approve

We also need:

to include a commit that updates DisableExtensionOperations on the machines, so that we can test & leverage the updated functionality we will get by vendoring.

in order to close CORS-3483. I'm fine with doing that in a separate PR.

Copy link
Contributor

openshift-ci bot commented Jun 13, 2024

[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 /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 Jun 13, 2024
@rna-afk
Copy link
Contributor Author

rna-afk commented Jun 13, 2024

Created #8594 to set the DisableExtensionOperations

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 13, 2024
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.
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2024
Copy link
Contributor

openshift-ci bot commented Jun 13, 2024

New changes are detected. LGTM label has been removed.

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 13, 2024
@rna-afk
Copy link
Contributor Author

rna-afk commented Jun 14, 2024

/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

@rna-afk
Copy link
Contributor Author

rna-afk commented Jun 14, 2024

/retest

Copy link
Contributor

openshift-ci bot commented Jun 14, 2024

@rna-afk: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-e2e-aws-ovn-upgrade 863364d link false /test okd-e2e-aws-ovn-upgrade
ci/prow/e2e-vsphere-ovn-upi 863364d link true /test e2e-vsphere-ovn-upi
ci/prow/altinfra-e2e-vsphere-capi-ovn 0e5dfbe link false /test altinfra-e2e-vsphere-capi-ovn
ci/prow/altinfra-e2e-powervs-capi-ovn 0e5dfbe link false /test altinfra-e2e-powervs-capi-ovn
ci/prow/altinfra-e2e-azure-capi-ovn 0e5dfbe link false /test altinfra-e2e-azure-capi-ovn
ci/prow/altinfra-e2e-gcp-capi-ovn 0e5dfbe link false /test altinfra-e2e-gcp-capi-ovn
ci/prow/altinfra-e2e-nutanix-capi-ovn 0e5dfbe link false /test altinfra-e2e-nutanix-capi-ovn
ci/prow/e2e-external-aws-ccm 0e5dfbe link false /test e2e-external-aws-ccm
ci/prow/e2e-azurestack 0e5dfbe link false /test e2e-azurestack
ci/prow/altinfra-e2e-openstack-capi-ovn 0e5dfbe link false /test altinfra-e2e-openstack-capi-ovn
ci/prow/e2e-aws-ovn-fips 0e5dfbe link false /test e2e-aws-ovn-fips

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.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 15, 2024
@openshift-merge-robot
Copy link
Contributor

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.

@sadasu
Copy link
Contributor

sadasu commented Jun 18, 2024

/close

Replaced by #8627

@openshift-ci openshift-ci bot closed this Jun 18, 2024
Copy link
Contributor

openshift-ci bot commented Jun 18, 2024

@sadasu: Closed this PR.

In response to this:

/close

Replaced by #8627

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.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants