update kubespray

docs/en/usage/airgap.md

@@ -234,8 +234,12 @@ debian_repo: "{{ minio_address }}"
 ubuntu_repo: "{{ minio_address }}"
 
 ### If containerd uses a non-secure HTTP authentication-free method, it needs to be configured:
-containerd_insecure_registries:
-  "{{ registry_address }}": "http://{{ registry_address }}"
+containerd_registries_mirrors:
+  - prefix: "{{ registry_address }}"
+    mirrors:
+      - host: "http://{{ registry_address }}"
+        capabilities: ["pull", "resolve"]
+        skip_verify: true
 
 ### Required if docker uses non-secure HTTP authentication-free methods:
 docker_insecure_registries:

docs/zh/usage/airgap.md

@@ -313,8 +313,12 @@ debian_repo: "{{ minio_address }}"
 ubuntu_repo: "{{ minio_address }}"
 
 ### 如果 containerd 采用非安全 HTTP 免认证方式, 则需要配置:
-containerd_insecure_registries:
-  "{{ registry_address }}": "http://{{ registry_address }}"
+containerd_registries_mirrors:
+  - prefix: "{{ registry_address }}"
+    mirrors:
+      - host: "http://{{ registry_address }}"
+        capabilities: ["pull", "resolve"]
+        skip_verify: true
 
 ### 如果 docker 采用非安全 HTTP 免认证方式, 则需要配置:
 docker_insecure_registries:

examples/install/3.airgap/VarsConfCM.yml

@@ -18,8 +18,14 @@ data:
     docker_containerd_version: "latest"
     docker_insecure_registries:
         - "{{ registry_host }}"
-    containerd_insecure_registries:
+    containerd_insecure_registries: ## kubespray will not support containerd_insecure_registries but containerd_registries_mirrors after v2.23.0
         "REGISTRY_HOST:REGISTRY_PORT": "http://{{ registry_host }}"
+    containerd_registries_mirrors:
+      - prefix: "REGISTRY_HOST:REGISTRY_PORT"
+        mirrors:
+          - host: "http://{{ registry_host }}"
+            capabilities: ["pull", "resolve"]
+            skip_verify: true
     k8s_image_pull_policy: IfNotPresent
     kube_network_plugin: calico
     kube_network_plugin_multus: false

test/offline-common/vars-conf-cm.yml

@@ -15,6 +15,12 @@ data:
     ### if containerd uses the non-secure HTTP authentication exemption mode, this parameter is required
     containerd_insecure_registries:
       "registry_host_key": "http://{{registry_host}}"
+    containerd_registries_mirrors:
+      - prefix: "registry_host_key"
+        mirrors:
+          - host: "http://{{registry_host}}"
+            capabilities: ["pull", "resolve"]
+            skip_verify: true
     ### if docker uses the non-secure HTTP authentication exemption mode, this parameter is required
     docker_insecure_registries:
       - "registry_host_key"

test/tools/utils.go

@@ -164,6 +164,12 @@ var groupVarsYaml = `
 	container_manager: containerd
 	containerd_insecure_registries:
 		"10.6.170.10:5000": "http://10.6.170.10:5000"
+    containerd_registries_mirrors:
+      - prefix: "10.6.170.10:5000"
+        mirrors:
+          - host: "http://10.6.170.10:5000"
+            capabilities: ["pull", "resolve"]
+            skip_verify: true
 	k8s_image_pull_policy: IfNotPresent
 	kube_network_plugin: %s
 	kube_network_plugin_multus: false

version.yml

@@ -1,2 +1,2 @@
-kubespray_version: 3b68d63643999647fecc050dae47e34a106a5f22
+kubespray_version: 748b0b294d0fc4ae75af0f8cd891c1fd01f50dd5
 kubernetes_version: v1.26.7