the status fields for the machine and cluster changed

AshleyDumaine · AshleyDumaine · commit 8b92138fd736 · 2025-09-23T13:13:34.000-04:00
diff --git a/e2e/capl-cluster-flavors/k3s-capl-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/k3s-capl-cluster/assert-child-cluster-resources.yaml
@@ -19,8 +19,9 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
@@ -32,7 +33,6 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta2
diff --git a/e2e/capl-cluster-flavors/kubeadm-capl-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/kubeadm-capl-cluster/assert-child-cluster-resources.yaml
@@ -19,8 +19,9 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
@@ -32,7 +33,6 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta2
@@ -42,8 +42,7 @@ metadata:
     cluster.x-k8s.io/cluster-name: ($cluster)
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
-  ready: true
+  availableReplicas: 1
 ---
 apiVersion: addons.cluster.x-k8s.io/v1alpha1
 kind: HelmReleaseProxy
diff --git a/e2e/capl-cluster-flavors/kubeadm-flatcar-vpcless-capl-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/kubeadm-flatcar-vpcless-capl-cluster/assert-child-cluster-resources.yaml
@@ -19,8 +19,9 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
@@ -32,7 +33,6 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta2
@@ -42,8 +42,7 @@ metadata:
     cluster.x-k8s.io/cluster-name: ($cluster)
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
-  ready: true
+  availableReplicas: 1
 ---
 apiVersion: addons.cluster.x-k8s.io/v1alpha1
 kind: HelmReleaseProxy
diff --git a/e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/assert-child-cluster-resources.yaml
@@ -19,8 +19,9 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
@@ -32,7 +33,6 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta2
@@ -42,8 +42,9 @@ metadata:
     cluster.x-k8s.io/cluster-name: ($cluster)
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
-  ready: true
+  availableReplicas: 1
+  initialization:
+    controlPlaneInitialized: true
 ---
 apiVersion: addons.cluster.x-k8s.io/v1alpha1
 kind: HelmReleaseProxy
@@ -72,5 +73,6 @@ kind: Cluster
 metadata:
   name: ($cluster)
 status:
-  infrastructureReady: true
-  phase: Provisioned
+  initialization:
+    controlPlaneInitialized: true
+    infrastructureProvisioned: true
diff --git a/e2e/capl-cluster-flavors/rke2-capl-cluster/assert-child-cluster-resources.yaml b/e2e/capl-cluster-flavors/rke2-capl-cluster/assert-child-cluster-resources.yaml
@@ -19,8 +19,9 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
@@ -32,7 +33,6 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta2
diff --git a/e2e/linodemachine-controller/cluster-object-store/assert-linodemachine.yaml b/e2e/linodemachine-controller/cluster-object-store/assert-linodemachine.yaml
@@ -19,5 +19,5 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    infrastructureProvisioned: true
diff --git a/e2e/linodemachine-controller/cluster-object-store/create-cluster.yaml b/e2e/linodemachine-controller/cluster-object-store/create-cluster.yaml
@@ -9,7 +9,7 @@ spec:
     kind: KubeadmControlPlane
     name: ($cluster)
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: LinodeCluster
     name: ($cluster)
 ---
diff --git a/e2e/linodemachine-controller/cluster-object-store/create-linodemachine.yaml b/e2e/linodemachine-controller/cluster-object-store/create-linodemachine.yaml
@@ -19,7 +19,7 @@ spec:
     machineTemplate:
         spec:
             infrastructureRef:
-                apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+                apiGroup: infrastructure.cluster.x-k8s.io
                 kind: LinodeMachineTemplate
                 name: ($cluster)
     replicas: 1
diff --git a/e2e/linodemachine-controller/linodecluster-vpcref-integration/assert-linodemachine.yaml b/e2e/linodemachine-controller/linodecluster-vpcref-integration/assert-linodemachine.yaml
@@ -19,5 +19,5 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    infrastructureProvisioned: true
diff --git a/e2e/linodemachine-controller/linodecluster-vpcref-integration/create-cluster-vpc.yaml b/e2e/linodemachine-controller/linodecluster-vpcref-integration/create-cluster-vpc.yaml
@@ -9,7 +9,7 @@ spec:
         kind: KubeadmControlPlane
         name: ($cluster)
     infrastructureRef:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+        apiGroup: infrastructure.cluster.x-k8s.io
         kind: LinodeCluster
         name: ($cluster)
 ---
diff --git a/e2e/linodemachine-controller/linodecluster-vpcref-integration/create-linodemachine.yaml b/e2e/linodemachine-controller/linodecluster-vpcref-integration/create-linodemachine.yaml
@@ -13,7 +13,7 @@ spec:
     machineTemplate:
         spec:
             infrastructureRef:
-                apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+                apiGroup: infrastructure.cluster.x-k8s.io
                 kind: LinodeMachineTemplate
                 name: ($cluster)
     replicas: 1
diff --git a/e2e/linodemachine-controller/linodemachine-vpcref-integration/assert-linodemachine.yaml b/e2e/linodemachine-controller/linodemachine-vpcref-integration/assert-linodemachine.yaml
@@ -19,5 +19,5 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    infrastructureProvisioned: true
diff --git a/e2e/linodemachine-controller/linodemachine-vpcref-integration/create-cluster-vpc.yaml b/e2e/linodemachine-controller/linodemachine-vpcref-integration/create-cluster-vpc.yaml
@@ -9,7 +9,7 @@ spec:
         kind: KubeadmControlPlane
         name: ($cluster)
     infrastructureRef:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+        apiGroup: infrastructure.cluster.x-k8s.io
         kind: LinodeCluster
         name: ($cluster)
 ---
diff --git a/e2e/linodemachine-controller/linodemachine-vpcref-integration/create-linodemachine.yaml b/e2e/linodemachine-controller/linodemachine-vpcref-integration/create-linodemachine.yaml
@@ -13,7 +13,7 @@ spec:
     machineTemplate:
         spec:
             infrastructureRef:
-                apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+                apiGroup: infrastructure.cluster.x-k8s.io
                 kind: LinodeMachineTemplate
                 name: ($cluster)
     replicas: 1
diff --git a/e2e/linodemachine-controller/metadata-gzip-compression/assert-linodemachine.yaml b/e2e/linodemachine-controller/metadata-gzip-compression/assert-linodemachine.yaml
@@ -19,5 +19,6 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
diff --git a/e2e/linodemachine-controller/metadata-gzip-compression/create-cluster.yaml b/e2e/linodemachine-controller/metadata-gzip-compression/create-cluster.yaml
@@ -9,7 +9,7 @@ spec:
     kind: KubeadmControlPlane
     name: ($cluster)
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: LinodeCluster
     name: ($cluster)
 ---
diff --git a/e2e/linodemachine-controller/metadata-gzip-compression/create-linodemachine.yaml b/e2e/linodemachine-controller/metadata-gzip-compression/create-linodemachine.yaml
@@ -19,7 +19,7 @@ spec:
     machineTemplate:
         spec:
             infrastructureRef:
-                apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+                apiGroup: infrastructure.cluster.x-k8s.io
                 kind: LinodeMachineTemplate
                 name: ($cluster)
     replicas: 1
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/assert-linodemachine.yaml b/e2e/linodemachine-controller/minimal-linodemachine/assert-linodemachine.yaml
@@ -19,5 +19,6 @@ metadata:
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/create-cluster.yaml b/e2e/linodemachine-controller/minimal-linodemachine/create-cluster.yaml
@@ -9,6 +9,7 @@ spec:
     kind: KubeadmControlPlane
     name: ($cluster)
   infrastructureRef:
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: LinodeCluster
     name: ($cluster)
 ---
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/create-linodemachine.yaml b/e2e/linodemachine-controller/minimal-linodemachine/create-linodemachine.yaml
@@ -13,7 +13,7 @@ spec:
     machineTemplate:
         spec:
             infrastructureRef:
-                apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+                apiGroup: infrastructure.cluster.x-k8s.io
                 kind: LinodeMachineTemplate
                 name: ($cluster)
     replicas: 1
diff --git a/e2e/linodemachinetemplate-controller/lmt-tags/create-cluster.yaml b/e2e/linodemachinetemplate-controller/lmt-tags/create-cluster.yaml
@@ -9,6 +9,7 @@ spec:
     kind: KubeadmControlPlane
     name: ($cluster)
   infrastructureRef:
+    apiGroup: infrastructure.cluster.x-k8s.io
     kind: LinodeCluster
     name: ($cluster)
 ---
@@ -33,6 +34,7 @@ spec:
     machineTemplate:
         spec:
             infrastructureRef:
+                apiGroup: infrastructure.cluster.x-k8s.io
                 kind: LinodeMachineTemplate
                 name: ($cluster)
     replicas: 1
