[improvement][breaking] Update templates to comply with CAPI v1.11.X (#881)

* Move to the v1beta2 contract for the templates, fix all the breaking changes, remove defunct cilium-bgp-lb flavor

* bump apiversion in e2e tests

* disable k3s and rke2 until providers support CAPI v1.11.X

* remove k3s and rke2 from the docs for now

* the status fields for the machine and cluster changed

Author: AshleyDumaine

docs/src/SUMMARY.md

@@ -13,7 +13,6 @@
     - [Etcd](./topics/etcd.md)
     - [Firewalling](./topics/firewalling.md)
     - [Flavors](./topics/flavors/flavors.md)
-      - [Cilium BGP LB (kubeadm)](./topics/flavors/cilium-bgp-lb.md)
       - [Cluster Autoscaler](./topics/flavors/cluster-autoscaler.md)
       - [ClusterClass kubeadm](./topics/flavors/clusterclass-kubeadm.md)
       - [DNS based apiserver Load Balancing](./topics/flavors/dns-loadbalancing.md)
@@ -22,9 +21,7 @@
       - [Etcd Backup](./topics/flavors/etcd-backup-restore.md)
       - [Etcd-disk](./topics/flavors/etcd-disk.md)
       - [Flatcar](./topics/flavors/flatcar.md)
-      - [k3s](./topics/flavors/k3s.md)
       - [konnectivity (kubeadm)](./topics/flavors/konnectivity.md)
-      - [rke2](./topics/flavors/rke2.md)
       - [vpcless](./topics/flavors/vpcless.md)
     - [Linode Cloud Controller Manager](./topics/linode-cloud-controller-manager.md)
     - [Machine Health Checks](./topics/health-checking.md)

docs/src/topics/flavors/cilium-bgp-lb.md

@@ -11,18 +11,19 @@ status:
   ready: true
   instanceState: running
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Machine
 metadata:
   labels:
     cluster.x-k8s.io/cluster-name: ($cluster)
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
 metadata:
   labels:
@@ -32,7 +33,6 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta2

e2e/capl-cluster-flavors/k3s-capl-cluster/assert-child-cluster-resources.yaml

@@ -6,9 +6,9 @@ metadata:
   name: k3s-capl-cluster
   # Labels to allow the test to be triggered based on selector flag
   labels:
-    all:
+#    all:
     k3s:
-    flavors:
+#    flavors:
 spec:
   bindings:
     # A short identifier for the E2E test run
@@ -55,10 +55,10 @@ spec:
             apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
             kind: LinodeMachine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: Machine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: MachineDeployment
         - describe:
             apiVersion: controlplane.cluster.x-k8s.io/v1beta2
@@ -127,7 +127,7 @@ spec:
       try:
         - delete:
             ref:
-              apiVersion: cluster.x-k8s.io/v1beta1
+              apiVersion: cluster.x-k8s.io/v1beta2
               kind: Cluster
               name: ($cluster)
         - error:

e2e/capl-cluster-flavors/k3s-capl-cluster/chainsaw-test.yaml

@@ -11,18 +11,19 @@ status:
   ready: true
   instanceState: running
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Machine
 metadata:
   labels:
     cluster.x-k8s.io/cluster-name: ($cluster)
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
 metadata:
   labels:
@@ -32,18 +33,16 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+apiVersion: controlplane.cluster.x-k8s.io/v1beta2
 kind: KubeadmControlPlane
 metadata:
   labels:
     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

e2e/capl-cluster-flavors/kubeadm-capl-cluster/assert-child-cluster-resources.yaml

@@ -57,13 +57,13 @@ spec:
             apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
             kind: LinodeMachine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: Machine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: MachineDeployment
         - describe:
-            apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+            apiVersion: controlplane.cluster.x-k8s.io/v1beta2
             kind: KubeadmControlPlane
         - describe:
             apiVersion: addons.cluster.x-k8s.io/v1alpha1

e2e/capl-cluster-flavors/kubeadm-capl-cluster/chainsaw-test.yaml

@@ -11,18 +11,19 @@ status:
   ready: true
   instanceState: running
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Machine
 metadata:
   labels:
     cluster.x-k8s.io/cluster-name: ($cluster)
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
 metadata:
   labels:
@@ -32,18 +33,16 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+apiVersion: controlplane.cluster.x-k8s.io/v1beta2
 kind: KubeadmControlPlane
 metadata:
   labels:
     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

e2e/capl-cluster-flavors/kubeadm-flatcar-vpcless-capl-cluster/assert-child-cluster-resources.yaml

@@ -115,13 +115,13 @@ spec:
             apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
             kind: LinodeMachine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: Machine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: MachineDeployment
         - describe:
-            apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+            apiVersion: controlplane.cluster.x-k8s.io/v1beta2
             kind: KubeadmControlPlane
         - describe:
             apiVersion: addons.cluster.x-k8s.io/v1alpha1
@@ -190,7 +190,7 @@ spec:
       try:
         - delete:
             ref:
-              apiVersion: cluster.x-k8s.io/v1beta1
+              apiVersion: cluster.x-k8s.io/v1beta2
               kind: Cluster
               name: ($cluster)
         - error:

e2e/capl-cluster-flavors/kubeadm-flatcar-vpcless-capl-cluster/chainsaw-test.yaml

@@ -11,18 +11,19 @@ status:
   ready: true
   instanceState: running
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Machine
 metadata:
   labels:
     cluster.x-k8s.io/cluster-name: ($cluster)
 spec:
   clusterName: ($cluster)
 status:
-  bootstrapReady: true
-  infrastructureReady: true
+  initialization:
+    bootstrapDataSecretCreated: true
+    infrastructureProvisioned: true
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: MachineDeployment
 metadata:
   labels:
@@ -32,18 +33,18 @@ spec:
   replicas: 1
 status:
   readyReplicas: 1
-  unavailableReplicas: 0
   availableReplicas: 1
 ---
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+apiVersion: controlplane.cluster.x-k8s.io/v1beta2
 kind: KubeadmControlPlane
 metadata:
   labels:
     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
@@ -67,10 +68,11 @@ metadata:
 status:
   ready: true
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Cluster
 metadata:
   name: ($cluster)
 status:
-  infrastructureReady: true
-  phase: Provisioned
+  initialization:
+    controlPlaneInitialized: true
+    infrastructureProvisioned: true

e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/assert-child-cluster-resources.yaml

@@ -73,20 +73,20 @@ spec:
             apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
             kind: LinodeMachine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: Machine
         - describe:
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: MachineDeployment
         - describe:
-            apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+            apiVersion: controlplane.cluster.x-k8s.io/v1beta2
             kind: KubeadmControlPlane
         - describe:
             apiVersion: addons.cluster.x-k8s.io/v1alpha1
             kind: HelmReleaseProxy
         - describe:
             cluster: ($cluster)
-            apiVersion: cluster.x-k8s.io/v1beta1
+            apiVersion: cluster.x-k8s.io/v1beta2
             kind: Cluster
             namespace: ($namespace)
         - describe:
@@ -404,7 +404,7 @@ spec:
       try:
         - delete:
             ref:
-              apiVersion: cluster.x-k8s.io/v1beta1
+              apiVersion: cluster.x-k8s.io/v1beta2
               kind: Cluster
               name: ($cluster)
         - delete: