no-jira: Bump CAPZ Version

[patrickdillon]

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

[openshift-ci-robot]

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

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

• cluster-api/providers/azure/OWNERS

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

[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]

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

[patrickdillon]

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]

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).

[openshift-ci]

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

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.