use kind labels field (#376)

Signed-off-by: Manabu McCloskey <[email protected]>
cnoe-io · Aug 29, 2024 · eab34d6 · eab34d6
1 parent 4f602a4
commit eab34d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/pkg/kind/cluster_test.go b/pkg/kind/cluster_test.go
@@ -37,12 +37,8 @@ apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: "kindest/node:v1.26.3"
-  kubeadmConfigPatches:
-  - |
-    kind: InitConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        node-labels: "ingress-ready=true"
+  labels:
+    ingress-ready: "true"
   extraPortMappings:
   - containerPort: 443
     hostPort: 8443
@@ -77,12 +73,8 @@ apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: "kindest/node:v1.26.3"
-  kubeadmConfigPatches:
-  - |
-    kind: InitConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        node-labels: "ingress-ready=true"
+  labels:
+    ingress-ready: "true"
   extraPortMappings:
   - containerPort: 443
     hostPort: 8443

diff --git a/pkg/kind/resources/kind.yaml.tmpl b/pkg/kind/resources/kind.yaml.tmpl
@@ -4,12 +4,8 @@ apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: "kindest/node:{{ .KubernetesVersion }}"
-  kubeadmConfigPatches:
-  - |
-    kind: InitConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        node-labels: "ingress-ready=true"
+  labels:
+    ingress-ready: "true"
   extraPortMappings:
   - containerPort: {{ if (eq .Protocol "http")  -}} 80 {{- else -}} 443 {{- end }}
     hostPort: {{ .Port }}