From 63a81978e382bb4c1f761fa329eb6d1440fb8fe8 Mon Sep 17 00:00:00 2001 From: cys158 Date: Thu, 25 Dec 2025 12:04:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BF=AE=E6=AD=A3k8s=201.35.x?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../init-kubernetes/templates/kubeadm/kubeadm-init.v1beta2 | 1 - .../init-kubernetes/templates/kubeadm/kubeadm-init.v1beta3 | 1 - 2 files changed, 2 deletions(-) diff --git a/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta2 b/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta2 index ab75ad73..c65cdeba 100644 --- a/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta2 +++ b/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta2 @@ -207,7 +207,6 @@ featureGates: {{ .kubernetes.kubelet.feature_gates | toYaml | indent 2 }} {{- end }} cgroupDriver: {{ .cri.cgroup_driver }} -podSandboxImage: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" containerLogMaxSize: {{ .kubernetes.kubelet.container_log_max_size }} containerLogMaxFiles: {{ .kubernetes.kubelet.container_log_max_files }} {{- if .kubernetes.kubelet.extra_args | empty | not }} diff --git a/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta3 b/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta3 index beb85223..93f70a64 100644 --- a/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta3 +++ b/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta3 @@ -206,7 +206,6 @@ featureGates: {{ .kubernetes.kubelet.feature_gates | toYaml | indent 2 }} {{- end }} cgroupDriver: {{ .cri.cgroup_driver }} -podSandboxImage: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" containerLogMaxSize: {{ .kubernetes.kubelet.container_log_max_size }} containerLogMaxFiles: {{ .kubernetes.kubelet.container_log_max_files }} {{- if .kubernetes.kubelet.extra_args | empty | not }}