Skip to content

no-jira: Bump CAPZ Version #9704

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

patrickdillon
Copy link
Contributor

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

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
Bumps CRDs for CAPZ & ASO version bump.
The CAPZ API was updated to switch LoadBalancerSpec to a pointer in
96986851f274bef5295fa94315e4e1d513d9f743. See
kubernetes-sigs/cluster-api-provider-azure#4611
@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 12, 2025
@openshift-ci-robot
Copy link
Contributor

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

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.

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

openshift-ci bot commented May 12, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign sadasu for approval. For more information see the Code Review Process.

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

openshift-ci bot commented May 12, 2025

@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-externallb-ovn 9d91c27 link false /test e2e-vsphere-externallb-ovn
ci/prow/e2e-azurestack 9d91c27 link false /test e2e-azurestack
ci/prow/e2e-vsphere-ovn-multi-network 9d91c27 link false /test e2e-vsphere-ovn-multi-network
ci/prow/e2e-aws-ovn-edge-zones 9d91c27 link false /test e2e-aws-ovn-edge-zones

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.

Copy link
Member

@tthvo tthvo left a comment

Choose a reason for hiding this comment

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

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

tthvo commented May 22, 2025

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

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 22, 2025
@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants