Skip to content

Commit 1ab0483

Browse files
committed
ClusterClass: fix YAMLs in proposal
Signed-off-by: Stefan Büringer [email protected]
1 parent abff417 commit 1ab0483

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

docs/proposals/202105256-cluster-class-and-managed-topologies.md

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -752,17 +752,22 @@ intentionally use resources without patches and variables to focus on the simple
752752
##### Create a new Cluster using ClusterClass object
753753
1. User creates a ClusterClass object.
754754
```yaml
755-
apiVersion: cluster.x-k8s.io/v1alpha4
755+
apiVersion: cluster.x-k8s.io/v1beta1
756756
kind: ClusterClass
757757
metadata:
758758
name: mixed
759759
namespace: bar
760760
spec:
761761
controlPlane:
762762
ref:
763-
apiVersion: controlplane.cluster.x-k8s.io/v1alpha4
763+
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
764764
kind: KubeadmControlPlaneTemplate
765765
name: vsphere-prod-cluster-template-kcp
766+
machineInfrastructure:
767+
ref:
768+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
769+
kind: VSphereMachineTemplate
770+
name: linux-vsphere-template
766771
# This will create a MachineHealthCheck for ControlPlane machines.
767772
machineHealthCheck:
768773
nodeStartupTimeout: 3m
@@ -775,17 +780,17 @@ intentionally use resources without patches and variables to focus on the simple
775780
status: "False"
776781
timeout: 300s
777782
workers:
778-
deployments:
783+
machineDeployments:
779784
- class: linux-worker
780785
template:
781786
bootstrap:
782787
ref:
783-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
788+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
784789
kind: KubeadmConfigTemplate
785790
name: existing-boot-ref
786791
infrastructure:
787792
ref:
788-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
793+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
789794
kind: VSphereMachineTemplate
790795
name: linux-vsphere-template
791796
# This will create a health check for each deployment created with the "linux-worker" MachineDeploymentClass
@@ -796,17 +801,17 @@ intentionally use resources without patches and variables to focus on the simple
796801
timeout: 300s
797802
- type: Ready
798803
status: "False"
799-
timeout: 300s
804+
timeout: 300s
800805
- class: windows-worker
801806
template:
802807
bootstrap:
803808
ref:
804-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
809+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
805810
kind: KubeadmConfigTemplate
806811
name: existing-boot-ref-windows
807812
infrastructure:
808813
ref:
809-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
814+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
810815
kind: VSphereMachineTemplate
811816
name: windows-vsphere-template
812817
# This will create a health check for each deployment created with the "windows-worker" MachineDeploymentClass
@@ -817,16 +822,16 @@ intentionally use resources without patches and variables to focus on the simple
817822
timeout: 300s
818823
- type: Ready
819824
status: "False"
820-
timeout: 300s
825+
timeout: 300s
821826
infrastructure:
822827
ref:
823-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
828+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
824829
kind: VSphereClusterTemplate
825830
name: vsphere-prod-cluster-template
826831
```
827832
2. User creates a cluster using the class name and defining the topology.
828833
```yaml
829-
apiVersion: cluster.x-k8s.io/v1alpha4
834+
apiVersion: cluster.x-k8s.io/v1beta1
830835
kind: Cluster
831836
metadata:
832837
name: foo
@@ -923,7 +928,7 @@ to avoid creating separate ClusterClasses for every small deviation, e.g. a diff
923928

924929
1. User creates a ClusterClass object with variables and patches (other fields are omitted for brevity).
925930
```yaml
926-
apiVersion: cluster.x-k8s.io/v1alpha4
931+
apiVersion: cluster.x-k8s.io/v1beta1
927932
kind: ClusterClass
928933
metadata:
929934
name: my-cluster-class
@@ -944,7 +949,7 @@ to avoid creating separate ClusterClasses for every small deviation, e.g. a diff
944949
- name: region
945950
definitions:
946951
- selector:
947-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
952+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
948953
kind: AWSClusterTemplate
949954
jsonPatches:
950955
- op: replace
@@ -954,7 +959,7 @@ to avoid creating separate ClusterClasses for every small deviation, e.g. a diff
954959
- name: controlPlaneMachineType
955960
definitions:
956961
- selector:
957-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
962+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
958963
kind: AWSMachineTemplate
959964
matchResources:
960965
controlPlane: true
@@ -969,7 +974,7 @@ to avoid creating separate ClusterClasses for every small deviation, e.g. a diff
969974

970975
1. User creates a Cluster referencing the ClusterClass created above and defining variables (other fields are omitted for brevity).
971976
```yaml
972-
apiVersion: cluster.x-k8s.io/v1alpha4
977+
apiVersion: cluster.x-k8s.io/v1beta1
973978
kind: Cluster
974979
metadata:
975980
name: my-cluster

0 commit comments

Comments
 (0)