Skip to content

Commit fe78b53

Browse files
willie-yaowillie-yao
committed
Revert MachinePool infrastructure refs to v1beta1
CAPI v1.13.0-rc.0's MachinePool controller still uses external.IsReady() which reads status.ready from the infrastructure object. Unlike the Machine and Cluster controllers which use the contract to read status.initialization.provisioned for v1beta2, the MachinePool controller has not been migrated to use the contract yet. In our v1beta2 types, status.ready was moved to status.deprecated.v1beta1.ready, so external.IsReady() returns false when reading the v1beta2 representation directly. This caused all MachinePool E2E tests to time out waiting for ready replicas. Revert AzureMachinePool, AzureManagedMachinePool, and AzureASOManagedMachinePool infrastructure refs to v1beta1 so the conversion webhook serves status.ready at the expected top-level path. All other CAPZ types remain at v1beta2 since CAPI reads their status via the contract. Signed-off-by: William Yao <william2000yao@gmail.com>
1 parent fbbd93b commit fe78b53

58 files changed

Lines changed: 180 additions & 180 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎templates/cluster-template-aks-aso-clusterclass.yaml‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-aks-aso.yaml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-aks-clusterclass.yaml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-aks.yaml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-machinepool-windows.yaml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-machinepool.yaml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/flavors/aks-aso-clusterclass/azure-managed-machinepool-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
1+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
22
kind: AzureASOManagedMachinePoolTemplate
33
metadata:
44
name: ${CLUSTER_NAME}-pool0
@@ -7,7 +7,7 @@ spec:
77
template:
88
spec: {}
99
---
10-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
10+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
1111
kind: AzureASOManagedMachinePoolTemplate
1212
metadata:
1313
name: ${CLUSTER_NAME}-pool1

‎templates/flavors/aks-aso-clusterclass/clusterclass.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
name: ${CLUSTER_NAME}-pool0
2626
infrastructure:
2727
ref:
28-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
28+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
2929
kind: AzureASOManagedMachinePoolTemplate
3030
name: ${CLUSTER_NAME}-pool0
3131
- class: default-worker
@@ -37,7 +37,7 @@ spec:
3737
name: ${CLUSTER_NAME}-pool1
3838
infrastructure:
3939
ref:
40-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
40+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
4141
kind: AzureASOManagedMachinePoolTemplate
4242
name: ${CLUSTER_NAME}-pool1
4343
# CAPI doesn't let you replace fields of array elements, so we patch the
@@ -99,7 +99,7 @@ spec:
9999
- name: azureasomanagedmachinepool-pool0-spec
100100
definitions:
101101
- selector:
102-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
102+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
103103
kind: AzureASOManagedMachinePoolTemplate
104104
matchResources:
105105
machinePoolClass:
@@ -127,7 +127,7 @@ spec:
127127
- name: azureasomanagedmachinepool-pool1-spec
128128
definitions:
129129
- selector:
130-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
130+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
131131
kind: AzureASOManagedMachinePoolTemplate
132132
matchResources:
133133
machinePoolClass:

‎templates/flavors/aks-aso/cluster-template.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ spec:
6868
dataSecretName: ""
6969
clusterName: "${CLUSTER_NAME}"
7070
infrastructureRef:
71-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
71+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
7272
kind: AzureASOManagedMachinePool
7373
name: "${CLUSTER_NAME}-pool0"
7474
version: "${KUBERNETES_VERSION}"
7575
---
76-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
76+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
7777
kind: AzureASOManagedMachinePool
7878
metadata:
7979
name: "${CLUSTER_NAME}-pool0"
@@ -107,12 +107,12 @@ spec:
107107
dataSecretName: ""
108108
clusterName: "${CLUSTER_NAME}"
109109
infrastructureRef:
110-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
110+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
111111
kind: AzureASOManagedMachinePool
112112
name: "${CLUSTER_NAME}-pool1"
113113
version: "${KUBERNETES_VERSION}"
114114
---
115-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
115+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
116116
kind: AzureASOManagedMachinePool
117117
metadata:
118118
name: "${CLUSTER_NAME}-pool1"

‎templates/flavors/aks-clusterclass/azure-managed-machinepool-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
1+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
22
kind: AzureManagedMachinePoolTemplate
33
metadata:
44
name: ${CLUSTER_NAME}-pool0
@@ -10,7 +10,7 @@ spec:
1010
name: pool0
1111
sku: ${AZURE_NODE_MACHINE_TYPE}
1212
---
13-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
13+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
1414
kind: AzureManagedMachinePoolTemplate
1515
metadata:
1616
name: ${CLUSTER_NAME}-pool1

0 commit comments

Comments
 (0)