Merge pull request #105 from elmiko/capi16-k8s128-fixups

update capd template to use 1.6 best practices
kubernetes-sigs · Mar 12, 2024 · 25f4a73 · 25f4a73
2 parents cbed0c5 + 692af60
commit 25f4a73
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/hack/tests/Makefile b/hack/tests/Makefile
@@ -23,7 +23,8 @@ KUBE_RBAC_PROXY_VERSION ?= v0.5.0
 KUBE_RBAC_IMAGE_REPOSITORY ?= quay.io/coreos
 KUBE_RBAC_PROXY ?= kube-rbac-proxy
 DEV_REGISTRY ?= localhost:5000
-CAPI_VERSION := v1.5.99
+CAPI_VERSION := v1.6.99
+XDG_CONFIG_HOME ?= $(HOME)/.config
 
 .start-kind-cluster:
 	@kind delete cluster; sleep 20; docker network create kind; $(TEST_DIR)/utils/kind-with-registry.sh

diff --git a/hack/tests/resources/docker-control-plane.yaml b/hack/tests/resources/docker-control-plane.yaml
@@ -53,25 +53,21 @@ spec:
         certSANs:
         - localhost
         - 127.0.0.1
+        - 0.0.0.0
+        - host.docker.internal
       controllerManager:
         extraArgs:
           enable-hostpath-provisioner: "true"
     initConfiguration:
-      nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
-        kubeletExtraArgs:
-          eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+      nodeRegistration: {}
     joinConfiguration:
-      nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
-        kubeletExtraArgs:
-          eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+      nodeRegistration: {}
   machineTemplate:
     infrastructureRef:
       apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
       kind: DockerMachineTemplate
       name: km-cp-control-plane
       namespace: default
   replicas: 1
-  version: v1.28.0
+  version: v1.28.7
 
diff --git a/hack/tests/resources/kubemark-machine-deployment-external-cluster.yaml b/hack/tests/resources/kubemark-machine-deployment-external-cluster.yaml
@@ -29,7 +29,7 @@ spec:
         apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
         kind: KubemarkMachineTemplate
         name: km-wl-kubemark-external-md-0
-      version: 1.28.0
+      version: 1.28.7
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
 kind: KubemarkMachineTemplate

diff --git a/hack/tests/resources/kubemark-machine-deployment.yaml b/hack/tests/resources/kubemark-machine-deployment.yaml
@@ -29,7 +29,7 @@ spec:
         apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
         kind: KubemarkMachineTemplate
         name: km-wl-kubemark-md-0
-      version: 1.28.0
+      version: 1.28.7
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
 kind: KubemarkMachineTemplate

diff --git a/templates/cluster-template-capd.yaml b/templates/cluster-template-capd.yaml
@@ -57,17 +57,12 @@ spec:
       controllerManager:
         extraArgs: {enable-hostpath-provisioner: 'true'}
       apiServer:
-        certSANs: [localhost, 127.0.0.1]
+        # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied.
+        certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
     initConfiguration:
-      nodeRegistration:
-        criSocket: unix:///var/run/containerd/containerd.sock
-        kubeletExtraArgs:
-          eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+      nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
     joinConfiguration:
-      nodeRegistration:
-        criSocket: unix:///var/run/containerd/containerd.sock
-        kubeletExtraArgs:
-          eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+      nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
   version: "${KUBERNETES_VERSION}"
 ---
 apiVersion: cluster.x-k8s.io/v1beta1