Merge pull request #108 from vprashar2929/chore-bump-kind

chore: update deprecated registry config

Author: vprashar2929

providers/kind/kind.sh

@@ -63,9 +63,20 @@ _prepare_config() {
 	local default_registry_port="5001"
 
 	info "Building manifests..."
+
+	# Create certs.d directory structure for containerd 2.0+ local registry
+	# Structure: certs.d/localhost:PORT/hosts.toml
+	local certs_d_dir="$KIND_DIR/certs.d/localhost:${REGISTRY_PORT}"
+	mkdir -p "$certs_d_dir"
+	sed <"$KIND_MANIFESTS_DIR/hosts.toml" \
+		-e "s/$default_registry_name/${KIND_REGISTRY_NAME}/g" \
+		>"$certs_d_dir/hosts.toml"
+
+	# Generate kind config with registry settings and certs.d mount path
 	sed <"$KIND_MANIFESTS_DIR/kind.yml" \
 		-e "s/$default_registry_name/${KIND_REGISTRY_NAME}/g" \
 		-e "s/$default_registry_port/${REGISTRY_PORT}/g" \
+		-e "s|KIND_DIR_PLACEHOLDER|${KIND_DIR}|g" \
 		>"$KIND_CONFIG_YAML"
 
 	for ((i = 0; i < KIND_WORKER_NODES; i++)); do
@@ -76,6 +87,8 @@ _prepare_config() {
 			        containerPath: /proc-host
 			      - hostPath: /usr/src
 			        containerPath: /usr/src
+			      - hostPath: ${KIND_DIR}/certs.d
+			        containerPath: /etc/containerd/certs.d
 
 		EOF_NODE
 	done
@@ -151,10 +164,11 @@ kind_down() {
 	run $CTR_CMD rm -v -f "${KIND_REGISTRY_NAME}"
 
 	info "Removing all generated files"
-	run rm -f \
+	run rm -rf \
 		"$KIND_CONFIG_YAML" \
 		"$KIND_REGISTRY_YAML" \
-		"$KIND_KUBECONFIG"
+		"$KIND_KUBECONFIG" \
+		"$KIND_DIR/certs.d"
 
 	ok "kind cluster deleted successfully"
 }

providers/kind/manifests/hosts.toml

@@ -0,0 +1,3 @@
+# containerd registry hosts configuration for local registry
+# See: https://github.com/containerd/containerd/blob/main/docs/hosts.md
+[host."http://kind-registry:5000"]

providers/kind/manifests/kind.yml

@@ -4,16 +4,18 @@ apiVersion: kind.x-k8s.io/v1alpha4
 networking:
   ipFamily: ipv4
 # create a cluster with the local registry enabled in containerd
+# Updated for containerd 2.0 (kind >= 0.24.0) - uses hosts.toml format
 containerdConfigPatches:
-- |-
-  [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:5001"]
-    endpoint = ["http://kind-registry:5000"]
+  - |-
+    [plugins."io.containerd.grpc.v1.cri".registry]
+      config_path = "/etc/containerd/certs.d"
 nodes:
   - role: control-plane
     extraMounts:
       - hostPath: /proc
         containerPath: /proc-host
       - hostPath: /usr/src
         containerPath: /usr/src
-
-# NOTE: worker nodes will be added by the script here
+      # Mount certs.d directory for local registry (containerd 2.0+)
+      - hostPath: KIND_DIR_PLACEHOLDER/certs.d
+        containerPath: /etc/containerd/certs.d

test/ubi.Dockerfile

@@ -1,4 +1,4 @@
-From registry.access.redhat.com/ubi9
+FROM registry.access.redhat.com/ubi9
 
 USER 0
 
@@ -9,6 +9,6 @@ RUN yum update -y && yum install -y git sudo
 #RUN yum install -y yum-utils
 #RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
 #RUN yum install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
-RUN sudo ./main.sh prerequisites
-RUN sudo ./main.sh containerruntime
-RUN sudo ./verify.sh containerruntime
+RUN ./main.sh prerequisites
+RUN ./main.sh containerruntime
+RUN ./verify.sh containerruntime