From dc088b96236c367e353b62e6404b844c9ecbf56a Mon Sep 17 00:00:00 2001 From: sivchari Date: Fri, 11 Jul 2025 11:54:31 +0900 Subject: [PATCH 1/4] 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 4ca1fe3c28ee..db94fa681ac9 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.34.0-beta.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 16a7581a96e8..c08ed63d2ced 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.34.0-beta.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 7bbfcf52acfa..f871ae988b35 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 bd4238a484a8..c27bea433f6e 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.34.0-beta.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 From b1d4de67b82804e7edc4f22514b0ca837e2ea2cc Mon Sep 17 00:00:00 2001 From: sivchari Date: Thu, 31 Jul 2025 15:01:12 +0900 Subject: [PATCH 2/4] update spec to adjust for v1beta2 Signed-off-by: sivchari --- .../docker/examples/machine-pool.yaml | 9 +++++--- .../docker/examples/simple-cluster-ipv6.yaml | 21 ++++++++++++------- .../examples/simple-cluster-without-kcp.yaml | 6 ++++-- .../docker/examples/simple-cluster.yaml | 9 +++++--- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/test/infrastructure/docker/examples/machine-pool.yaml b/test/infrastructure/docker/examples/machine-pool.yaml index db94fa681ac9..d5da270a0e75 100644 --- a/test/infrastructure/docker/examples/machine-pool.yaml +++ b/test/infrastructure/docker/examples/machine-pool.yaml @@ -49,11 +49,13 @@ spec: initConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" joinConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate @@ -101,4 +103,5 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" diff --git a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml index c08ed63d2ced..fac7673c0224 100644 --- a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml @@ -54,13 +54,17 @@ spec: bindPort: 6443 nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% - node-ip: "::" + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" + - name: "node-ip" + value: "::" joinConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% - node-ip: "::" + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" + - name: "node-ip" + value: "::" --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate @@ -116,9 +120,12 @@ spec: initConfiguration: nodeRegistration: kubeletExtraArgs: - node-ip: "::" + - name: "node-ip" + value: "::" joinConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% - node-ip: "::" + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" + - name: "node-ip" + value: "::" diff --git a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml index f871ae988b35..b131e2cc779f 100644 --- a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml @@ -52,7 +52,8 @@ spec: initConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachine @@ -105,4 +106,5 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" diff --git a/test/infrastructure/docker/examples/simple-cluster.yaml b/test/infrastructure/docker/examples/simple-cluster.yaml index c27bea433f6e..2fa6ecebb1da 100644 --- a/test/infrastructure/docker/examples/simple-cluster.yaml +++ b/test/infrastructure/docker/examples/simple-cluster.yaml @@ -49,11 +49,13 @@ spec: initConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" joinConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta2 kind: DockerMachineTemplate @@ -109,4 +111,5 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: - eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% + - name: "eviction-hard" + value: "nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%" From 08dd807f818ab6bd79e7f834ab87f3af8a091283 Mon Sep 17 00:00:00 2001 From: sivchari Date: Thu, 31 Jul 2025 15:47:58 +0900 Subject: [PATCH 3/4] update machineTemplate spec Signed-off-by: sivchari --- test/infrastructure/docker/examples/machine-pool.yaml | 9 +++++---- .../docker/examples/simple-cluster-ipv6.yaml | 9 +++++---- test/infrastructure/docker/examples/simple-cluster.yaml | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/test/infrastructure/docker/examples/machine-pool.yaml b/test/infrastructure/docker/examples/machine-pool.yaml index d5da270a0e75..cdd97e0d42f2 100644 --- a/test/infrastructure/docker/examples/machine-pool.yaml +++ b/test/infrastructure/docker/examples/machine-pool.yaml @@ -35,10 +35,11 @@ spec: replicas: 1 version: v1.34.0-beta.0 machineTemplate: - infrastructureRef: - apiGroup: infrastructure.cluster.x-k8s.io - kind: DockerMachineTemplate - name: controlplane + spec: + infrastructureRef: + apiGroup: infrastructure.cluster.x-k8s.io + kind: DockerMachineTemplate + name: controlplane kubeadmConfigSpec: clusterConfiguration: apiServer: diff --git a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml index fac7673c0224..629331567db0 100644 --- a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml @@ -35,10 +35,11 @@ spec: replicas: 1 version: v1.34.0-beta.0 machineTemplate: - infrastructureRef: - apiGroup: infrastructure.cluster.x-k8s.io - kind: DockerMachineTemplate - name: controlplane + spec: + infrastructureRef: + apiGroup: infrastructure.cluster.x-k8s.io + kind: DockerMachineTemplate + name: controlplane kubeadmConfigSpec: clusterConfiguration: apiServer: diff --git a/test/infrastructure/docker/examples/simple-cluster.yaml b/test/infrastructure/docker/examples/simple-cluster.yaml index 2fa6ecebb1da..d86201ea89a4 100644 --- a/test/infrastructure/docker/examples/simple-cluster.yaml +++ b/test/infrastructure/docker/examples/simple-cluster.yaml @@ -35,10 +35,11 @@ spec: replicas: 1 version: v1.34.0-beta.0 machineTemplate: - infrastructureRef: - apiGroup: infrastructure.cluster.x-k8s.io - kind: DockerMachineTemplate - name: controlplane + spec: + infrastructureRef: + apiGroup: infrastructure.cluster.x-k8s.io + kind: DockerMachineTemplate + name: controlplane kubeadmConfigSpec: clusterConfiguration: apiServer: From e552d4e4d2dd8bbddd9d810dada0fab9269db927 Mon Sep 17 00:00:00 2001 From: sivchari Date: Thu, 31 Jul 2025 17:30:58 +0900 Subject: [PATCH 4/4] add extraMounts Signed-off-by: sivchari --- test/infrastructure/docker/examples/machine-pool.yaml | 5 ++++- .../docker/examples/simple-cluster-ipv6.yaml | 10 ++++++++-- .../docker/examples/simple-cluster-without-kcp.yaml | 5 ++++- .../infrastructure/docker/examples/simple-cluster.yaml | 10 ++++++++-- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/test/infrastructure/docker/examples/machine-pool.yaml b/test/infrastructure/docker/examples/machine-pool.yaml index cdd97e0d42f2..8e4cdf33cb16 100644 --- a/test/infrastructure/docker/examples/machine-pool.yaml +++ b/test/infrastructure/docker/examples/machine-pool.yaml @@ -65,7 +65,10 @@ metadata: namespace: default spec: template: - spec: {} + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" --- apiVersion: cluster.x-k8s.io/v1beta2 kind: MachinePool diff --git a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml index 629331567db0..5205b41e74ef 100644 --- a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml @@ -74,7 +74,10 @@ metadata: namespace: default spec: template: - spec: {} + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" --- apiVersion: cluster.x-k8s.io/v1beta2 kind: MachineDeployment @@ -108,7 +111,10 @@ metadata: namespace: default spec: template: - spec: {} + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfigTemplate diff --git a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml index b131e2cc779f..6e68b8f6df10 100644 --- a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml @@ -93,7 +93,10 @@ metadata: namespace: default spec: template: - spec: {} + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfigTemplate diff --git a/test/infrastructure/docker/examples/simple-cluster.yaml b/test/infrastructure/docker/examples/simple-cluster.yaml index d86201ea89a4..447ea1084256 100644 --- a/test/infrastructure/docker/examples/simple-cluster.yaml +++ b/test/infrastructure/docker/examples/simple-cluster.yaml @@ -65,7 +65,10 @@ metadata: namespace: default spec: template: - spec: {} + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" --- apiVersion: cluster.x-k8s.io/v1beta2 kind: MachineDeployment @@ -99,7 +102,10 @@ metadata: namespace: default spec: template: - spec: {} + spec: + extraMounts: + - containerPath: "/var/run/docker.sock" + hostPath: "/var/run/docker.sock" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta2 kind: KubeadmConfigTemplate