no-jira: Bump CAPZ Version #9704

patrickdillon · 2025-05-12T16:29:09Z

Bumps CAPZ to v1.9.3 & ASO to v2.11.0

openshift-ci-robot · 2025-05-12T16:29:16Z

@patrickdillon: This pull request explicitly references no jira issue.

Details

In response to this:

Bumps CAPZ to v1.9.3 & ASO to v2.11.0

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.

tthvo

Looks good! I just have a question for the infra CRD update :D

I am checking version committed here with ones in CAPZ v1.19.3 release and ASO v2.11.0 release and there are some diff:

diff --git a/data/data/cluster-api/azure-infrastructure-components.yaml b/data/data/cluster-api/azure-infrastructure-components.yaml
index befc89e2c0..1adc853297 100644
--- a/data/data/cluster-api/azure-infrastructure-components.yaml
+++ b/data/data/cluster-api/azure-infrastructure-components.yaml
@@ -80798,7 +80798,7 @@ stringData:
   AZURE_SUBSCRIPTION_ID: ""
   AZURE_SYNC_PERIOD: ${AZURE_SYNC_PERIOD:=""}
   AZURE_TENANT_ID: ""
-  AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/main
+  AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/v1.19.3
 type: Opaque
 ---
 apiVersion: v1
@@ -81118,8 +81118,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.uid
-        image: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:main
-        imagePullPolicy: Always
+        image: registry.k8s.io/cluster-api-azure/cluster-api-azure-controller:v1.19.3
+        imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/data/data/cluster-api/azureaso-infrastructure-components.yaml b/data/data/cluster-api/azureaso-infrastructure-components.yaml
index 5488cc7323..22b2ec6f49 100644
--- a/data/data/cluster-api/azureaso-infrastructure-components.yaml
+++ b/data/data/cluster-api/azureaso-infrastructure-components.yaml
@@ -16641,432239 +16641,3 @@ webhooks:
         resources:
           - sites
     sideEffects: None
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.3

...more-but-too-large-to-show...

Should we use the version in the release assets?

tthvo · 2025-05-22T19:48:23Z

So far, other than rebase (hopefully easy haha) and #9704 (review), this looks good to me.

Bumps CAPZ to v1.19.3 and ASO to v2.11.0. Updates go.mod requires and go mod tidy for top-level go.mod, cluster-api/providers/azure(aso).

go mod vendor in top-level cluster-api/providers/azure cluster-api/providers/azureaso

The CAPZ API was updated to switch LoadBalancerSpec to a pointer in 96986851f274bef5295fa94315e4e1d513d9f743. See kubernetes-sigs/cluster-api-provider-azure#4611

Bumps CRDs for CAPZ & ASO version bump.

patrickdillon · 2025-05-28T19:17:11Z

Looks good! I just have a question for the infra CRD update :D

I am checking version committed here with ones in CAPZ v1.19.3 release and ASO v2.11.0 release and there are some diff:

diff --git a/data/data/cluster-api/azure-infrastructure-components.yaml b/data/data/cluster-api/azure-infrastructure-components.yaml
index befc89e2c0..1adc853297 100644
--- a/data/data/cluster-api/azure-infrastructure-components.yaml
+++ b/data/data/cluster-api/azure-infrastructure-components.yaml
@@ -80798,7 +80798,7 @@ stringData:
   AZURE_SUBSCRIPTION_ID: ""
   AZURE_SYNC_PERIOD: ${AZURE_SYNC_PERIOD:=""}
   AZURE_TENANT_ID: ""
-  AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/main
+  AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/v1.19.3
 type: Opaque
 ---
 apiVersion: v1
@@ -81118,8 +81118,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.uid
-        image: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:main
-        imagePullPolicy: Always
+        image: registry.k8s.io/cluster-api-azure/cluster-api-azure-controller:v1.19.3
+        imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/data/data/cluster-api/azureaso-infrastructure-components.yaml b/data/data/cluster-api/azureaso-infrastructure-components.yaml
index 5488cc7323..22b2ec6f49 100644
--- a/data/data/cluster-api/azureaso-infrastructure-components.yaml
+++ b/data/data/cluster-api/azureaso-infrastructure-components.yaml
@@ -16641,432239 +16641,3 @@ webhooks:
         resources:
           - sites
     sideEffects: None
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.3

...more-but-too-large-to-show...

Should we use the version in the release assets?

I have created #9752 which should help fix up the verify-capi-manifests script, which should make checking the CRDs easier, at least in theory, it took me some time to fixup the script!

tthvo

/lgtm

tthvo · 2025-05-28T22:24:16Z

Looking back at #9704 (review), the crd updates look correct tho, sorry. The diff seems like due to some spacing from copy-paste 😅. For azure, the released assets seems to have automations to patch the version tags in the infra manifest in comparison to what's seen in the tagged commit. I guess it wouldn't matter much. Leaving to others to approve here :d

I have created #9752 which should help fix up the verify-capi-manifests script, which should make checking the CRDs easier, at least in theory, it took me some time to fixup the script!

Oh nice thanks! This should be so much easier (avoid the spacing issue above haha).

patrickdillon · 2025-05-29T14:48:30Z

/approve

I happily realized this will help with https://issues.redhat.com/browse/OCPBUGS-36360 but let's move this along and make the final fixes for that bug in a separate PR.

openshift-ci · 2025-05-29T14:50:02Z

[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

Details

Needs approval from an approver in each of these files:

~~cluster-api/providers/azure/OWNERS~~ [patrickdillon]

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

openshift-ci-robot · 2025-05-29T19:05:12Z

/retest-required

Remaining retests: 0 against base HEAD 88ba667 and 2 for PR HEAD 1940825 in total

openshift-ci-robot · 2025-05-30T09:05:07Z

/retest-required

Remaining retests: 0 against base HEAD 9a9a0bc and 1 for PR HEAD 1940825 in total

openshift-ci · 2025-05-30T16:37:17Z

@patrickdillon: 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/e2e-vsphere-ovn-hybrid-env	`1940825`	link	false	`/test e2e-vsphere-ovn-hybrid-env`
ci/prow/okd-scos-e2e-aws-ovn	`1940825`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/e2e-azurestack	`1940825`	link	false	`/test e2e-azurestack`
ci/prow/e2e-vsphere-ovn-multi-network	`1940825`	link	false	`/test e2e-vsphere-ovn-multi-network`

Full PR test history. Your PR dashboard.

Details

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-ci-robot · 2025-05-30T17:14:06Z

/retest-required

Remaining retests: 0 against base HEAD 9a9a0bc and 2 for PR HEAD 1940825 in total

openshift-bot · 2025-05-31T03:46:27Z

[ART PR BUILD NOTIFIER]

Distgit: ose-installer
This PR has been included in build ose-installer-container-v4.20.0-202505310245.p0.g4bec6f4.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2025-05-31T03:55:27Z

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.20.0-202505310245.p0.g4bec6f4.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2025-05-31T04:25:28Z

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.20.0-202505310245.p0.g4bec6f4.assembly.stream.el9.
All builds following this will include this PR.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 12, 2025

openshift-ci bot requested review from jhixson74 and rna-afk May 12, 2025 16:31

tthvo reviewed May 16, 2025

View reviewed changes

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 22, 2025

patrickdillon added 4 commits May 28, 2025 13:10

go.mod: Bump CAPZ and ASO

c756427

Bumps CAPZ to v1.19.3 and ASO to v2.11.0. Updates go.mod requires and go mod tidy for top-level go.mod, cluster-api/providers/azure(aso).

Vendor: CAPZ & ASO Bump

4039cf6

go mod vendor in top-level cluster-api/providers/azure cluster-api/providers/azureaso

CAPZ: Switch LoadBalancerSpec to Pointer

a7467de

The CAPZ API was updated to switch LoadBalancerSpec to a pointer in 96986851f274bef5295fa94315e4e1d513d9f743. See kubernetes-sigs/cluster-api-provider-azure#4611

Bump CRDS for CAPZ & ASO

1940825

Bumps CRDs for CAPZ & ASO version bump.

patrickdillon force-pushed the bump-capz-aso branch from 9d91c27 to 1940825 Compare May 28, 2025 19:09

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 28, 2025

tthvo reviewed May 28, 2025

View reviewed changes

openshift-ci bot assigned tthvo May 28, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 28, 2025

tthvo mentioned this pull request May 28, 2025

no-jira: Fix verify capi manifests script #9752

Closed

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 29, 2025

openshift-merge-bot bot merged commit 4bec6f4 into openshift:main May 31, 2025
40 of 44 checks passed

no-jira: Bump CAPZ Version #9704

no-jira: Bump CAPZ Version #9704

Uh oh!

Conversation

patrickdillon commented May 12, 2025

Uh oh!

openshift-ci-robot commented May 12, 2025

Uh oh!

tthvo left a comment

Choose a reason for hiding this comment

Uh oh!

tthvo commented May 22, 2025

Uh oh!

patrickdillon commented May 28, 2025

Uh oh!

tthvo left a comment

Choose a reason for hiding this comment

Uh oh!

tthvo commented May 28, 2025

Uh oh!

patrickdillon commented May 29, 2025

Uh oh!

openshift-ci bot commented May 29, 2025

Uh oh!

openshift-ci-robot commented May 29, 2025

Uh oh!

openshift-ci-robot commented May 30, 2025

Uh oh!

openshift-ci bot commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented May 30, 2025

Uh oh!

Uh oh!

openshift-bot commented May 31, 2025

Uh oh!

openshift-bot commented May 31, 2025

Uh oh!

openshift-bot commented May 31, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

openshift-ci bot commented May 30, 2025 •

edited

Loading