From 60a50c0ede65153670fa35dd0c71a008ff006367 Mon Sep 17 00:00:00 2001 From: sivchari Date: Fri, 11 Jul 2025 11:54:31 +0900 Subject: [PATCH] update examples Signed-off-by: sivchari --- .../docker/examples/machine-pool.yaml | 29 +++++++---------- .../docker/examples/simple-cluster-ipv6.yaml | 29 +++++++---------- .../examples/simple-cluster-without-kcp.yaml | 31 ++++++++----------- .../docker/examples/simple-cluster.yaml | 29 +++++++---------- 4 files changed, 49 insertions(+), 69 deletions(-) diff --git a/test/infrastructure/docker/examples/machine-pool.yaml b/test/infrastructure/docker/examples/machine-pool.yaml index 234e65500be7..9bb22c5bf8bc 100644 --- a/test/infrastructure/docker/examples/machine-pool.yaml +++ b/test/infrastructure/docker/examples/machine-pool.yaml @@ -1,5 +1,5 @@ # Creates a cluster with one control-plane node and one worker node -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: Cluster metadata: name: my-cluster @@ -12,23 +12,21 @@ spec: cidrBlocks: ["192.168.0.0/16"] serviceDomain: cluster.local controlPlaneRef: - apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + apiGroup: controlplane.cluster.x-k8s.io kind: KubeadmControlPlane name: controlplane - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerCluster name: my-cluster - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerCluster metadata: name: my-cluster namespace: default --- -apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +apiVersion: controlplane.cluster.x-k8s.io/v1beta2 kind: KubeadmControlPlane metadata: name: controlplane @@ -38,10 +36,9 @@ spec: version: v1.33.0 machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachineTemplate name: controlplane - namespace: default kubeadmConfigSpec: clusterConfiguration: apiServer: @@ -58,7 +55,7 @@ spec: kubeletExtraArgs: eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate metadata: name: controlplane @@ -67,7 +64,7 @@ spec: template: spec: {} --- -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: MachinePool metadata: name: worker-mp-0 @@ -81,23 +78,21 @@ spec: clusterName: my-cluster bootstrap: configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + apiGroup: bootstrap.cluster.x-k8s.io kind: KubeadmConfig name: worker-mp-0-config - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachinePool name: worker-dmp-0 - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachinePool metadata: name: worker-dmp-0 namespace: default --- -apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfig metadata: name: worker-mp-0-config diff --git a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml index a76b34a21f12..52e988e095b8 100644 --- a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml @@ -1,5 +1,5 @@ # Creates a cluster with one control-plane node and one worker node -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: Cluster metadata: name: my-cluster @@ -12,23 +12,21 @@ spec: cidrBlocks: ["fd00:100:96::/48"] serviceDomain: cluster.local controlPlaneRef: - apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + apiGroup: controlplane.cluster.x-k8s.io kind: KubeadmControlPlane name: controlplane - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerCluster name: my-cluster - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerCluster metadata: name: my-cluster namespace: default --- -apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +apiVersion: controlplane.cluster.x-k8s.io/v1beta2 kind: KubeadmControlPlane metadata: name: controlplane @@ -38,10 +36,9 @@ spec: version: v1.33.0 machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachineTemplate name: controlplane - namespace: default kubeadmConfigSpec: clusterConfiguration: apiServer: @@ -65,7 +62,7 @@ spec: eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% node-ip: "::" --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate metadata: name: controlplane @@ -74,7 +71,7 @@ spec: template: spec: {} --- -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: MachineDeployment metadata: name: worker-md-0 @@ -91,17 +88,15 @@ spec: clusterName: my-cluster bootstrap: configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + apiGroup: bootstrap.cluster.x-k8s.io kind: KubeadmConfigTemplate name: worker - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachineTemplate name: worker - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate metadata: name: worker @@ -110,7 +105,7 @@ spec: template: spec: {} --- -apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfigTemplate metadata: name: worker diff --git a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml index dea778e8dd3e..2e159f1d7ab7 100644 --- a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml @@ -1,5 +1,5 @@ # Creates a cluster with one control-plane node and one worker node -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: Cluster metadata: name: my-cluster @@ -12,18 +12,17 @@ spec: cidrBlocks: ["192.168.0.0/16"] serviceDomain: cluster.local infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerCluster name: my-cluster - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerCluster metadata: name: my-cluster namespace: default --- -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: Machine metadata: labels: @@ -36,17 +35,15 @@ spec: clusterName: my-cluster bootstrap: configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + apiGroup: bootstrap.cluster.x-k8s.io kind: KubeadmConfig name: controlplane-0-config - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachine name: controlplane-0 - namespace: default --- -apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfig metadata: name: controlplane-0-config @@ -57,13 +54,13 @@ spec: kubeletExtraArgs: eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachine metadata: name: controlplane-0 namespace: default --- -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: MachineDeployment metadata: name: worker-md-0 @@ -80,17 +77,15 @@ spec: clusterName: my-cluster bootstrap: configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + apiGroup: bootstrap.cluster.x-k8s.io kind: KubeadmConfigTemplate name: worker - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachineTemplate name: worker - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate metadata: name: worker @@ -99,7 +94,7 @@ spec: template: spec: {} --- -apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfigTemplate metadata: name: worker diff --git a/test/infrastructure/docker/examples/simple-cluster.yaml b/test/infrastructure/docker/examples/simple-cluster.yaml index 7102c251a4f4..5fde33ce2453 100644 --- a/test/infrastructure/docker/examples/simple-cluster.yaml +++ b/test/infrastructure/docker/examples/simple-cluster.yaml @@ -1,5 +1,5 @@ # Creates a cluster with one control-plane node and one worker node -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: Cluster metadata: name: my-cluster @@ -12,23 +12,21 @@ spec: cidrBlocks: ["192.168.0.0/16"] serviceDomain: cluster.local controlPlaneRef: - apiVersion: controlplane.cluster.x-k8s.io/v1beta1 + apiGroup: controlplane.cluster.x-k8s.io kind: KubeadmControlPlane name: controlplane - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerCluster name: my-cluster - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerCluster metadata: name: my-cluster namespace: default --- -apiVersion: controlplane.cluster.x-k8s.io/v1beta1 +apiVersion: controlplane.cluster.x-k8s.io/v1beta2 kind: KubeadmControlPlane metadata: name: controlplane @@ -38,10 +36,9 @@ spec: version: v1.33.0 machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachineTemplate name: controlplane - namespace: default kubeadmConfigSpec: clusterConfiguration: apiServer: @@ -58,7 +55,7 @@ spec: kubeletExtraArgs: eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate metadata: name: controlplane @@ -67,7 +64,7 @@ spec: template: spec: {} --- -apiVersion: cluster.x-k8s.io/v1beta1 +apiVersion: cluster.x-k8s.io/v1beta2 kind: MachineDeployment metadata: name: worker-md-0 @@ -84,17 +81,15 @@ spec: clusterName: my-cluster bootstrap: configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 + apiGroup: bootstrap.cluster.x-k8s.io kind: KubeadmConfigTemplate name: worker - namespace: default infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 + apiGroup: infrastructure.cluster.x-k8s.io kind: DockerMachineTemplate name: worker - namespace: default --- -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate metadata: name: worker @@ -103,7 +98,7 @@ spec: template: spec: {} --- -apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 +apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfigTemplate metadata: name: worker