From d55ddf0aaf57ffbe718676c3b1c2f510a9be374d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=90=9B?= Date: Thu, 25 Dec 2025 11:39:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9ERocky9.7/Rocky1?= =?UTF-8?q?0.1=E7=B3=BB=E7=BB=9F=E9=83=A8=E7=BD=B2=E6=94=AF=E6=8C=81?= =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E6=96=B0=E5=A2=9Ek8s=20v1.34.x=E5=92=8C1?= =?UTF-8?q?.35.x=E9=83=A8=E7=BD=B2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../defaults/main/01-cluster_require.yaml | 2 + builtin/core/roles/defaults/vars/v1.34.yaml | 96 +++++++++++++++++++ builtin/core/roles/defaults/vars/v1.35.yaml | 96 +++++++++++++++++++ .../templates/kubeadm/kubeadm-init.v1beta2 | 4 +- .../templates/kubeadm/kubeadm-init.v1beta3 | 4 +- .../templates/kubeadm/kubeadm-join.v1beta2 | 3 - .../templates/kubeadm/kubeadm-join.v1beta3 | 3 - 7 files changed, 196 insertions(+), 12 deletions(-) create mode 100644 builtin/core/roles/defaults/vars/v1.34.yaml create mode 100644 builtin/core/roles/defaults/vars/v1.35.yaml diff --git a/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml b/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml index 12ff29a0..0895f963 100644 --- a/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml +++ b/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml @@ -12,6 +12,8 @@ cluster_require: - '"centos"' - kylin - '"kylin"' + - rocky + - '"rocky"' # Required network plugins require_network_plugin: ['calico', 'flannel', 'cilium', 'hybridnet', 'kube-ovn'] # Minimum supported Kubernetes version diff --git a/builtin/core/roles/defaults/vars/v1.34.yaml b/builtin/core/roles/defaults/vars/v1.34.yaml new file mode 100644 index 00000000..11dded53 --- /dev/null +++ b/builtin/core/roles/defaults/vars/v1.34.yaml @@ -0,0 +1,96 @@ +kubernetes: + # helm binary + helm_version: v3.18.5 +etcd: + # etcd binary + etcd_version: v3.5.25 +image_registry: + # ========== image registry ========== + # keepalived image tag. Used for load balancing when there are multiple image registry nodes. + keepalived_version: 2.0.20 + # ========== image registry: harbor ========== + # harbor image tag + harbor_version: v2.10.1 + # docker-compose binary + dockercompose_version: v2.20.3 + # ========== image registry: docker-registry ========== + # docker-registry image tag + docker_registry_version: 2.8.3 +cri: + # support: containerd,docker + container_manager: containerd + sandbox_image: + tag: "3.9" + # ========== cri ========== + # crictl binary + crictl_version: v1.33.0 + # ========== cri: docker ========== + # docker binary + docker_version: 24.0.7 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.1 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.7.6 + # runc binary + runc_version: v1.1.7 + # skip tls verify when pulling images + skip_tls_verify: false +cni: + type: calico + ipv6_support: false + multus: + image: + tag: v4.3.0 + # ========== cni ========== + # cni_plugins binary (optional) + # cni_plugins_version: v1.2.0 + # ========== cni: calico ========== + # calicoctl binary + calico_version: v3.28.2 + # ========== cni: cilium ========== + # cilium helm + cilium_version: 1.18.3 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.13.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 4.2.0 + linux_utils_image: + tag: 4.2.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.3.0 +dns: + dns_image: + tag: v1.12.1 + dns_cache_image: + tag: 1.24.0 +image_manifests: + - docker.io/calico/apiserver:v3.28.2 + - docker.io/calico/cni:v3.28.2 + - docker.io/calico/ctl:v3.28.2 + - docker.io/calico/csi:v3.28.2 + - docker.io/calico/kube-controllers:v3.28.2 + - docker.io/calico/node-driver-registrar:v3.28.2 + - docker.io/calico/node:v3.28.2 + - docker.io/calico/pod2daemon-flexvol:v3.28.2 + - docker.io/calico/typha:v3.28.2 + - docker.io/kubesphere/coredns:v1.12.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/pause:3.9 + - docker.io/openebs/linux-utils:4.2.0 + - docker.io/openebs/provisioner-localpv:4.2.0 + - quay.io/tigera/operator:v1.34.5 + - docker.io/library/haproxy:2.9.6-alpine diff --git a/builtin/core/roles/defaults/vars/v1.35.yaml b/builtin/core/roles/defaults/vars/v1.35.yaml new file mode 100644 index 00000000..2b2b1881 --- /dev/null +++ b/builtin/core/roles/defaults/vars/v1.35.yaml @@ -0,0 +1,96 @@ +kubernetes: + # helm binary + helm_version: v3.18.5 +etcd: + # etcd binary + etcd_version: v3.5.25 +image_registry: + # ========== image registry ========== + # keepalived image tag. Used for load balancing when there are multiple image registry nodes. + keepalived_version: 2.0.20 + # ========== image registry: harbor ========== + # harbor image tag + harbor_version: v2.10.1 + # docker-compose binary + dockercompose_version: v2.20.3 + # ========== image registry: docker-registry ========== + # docker-registry image tag + docker_registry_version: 2.8.3 +cri: + # support: containerd,docker + container_manager: containerd + sandbox_image: + tag: "3.10.1" + # ========== cri ========== + # crictl binary + crictl_version: v1.33.0 + # ========== cri: docker ========== + # docker binary + docker_version: 24.0.7 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.1 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.7.6 + # runc binary + runc_version: v1.1.7 + # skip tls verify when pulling images + skip_tls_verify: false +cni: + type: calico + ipv6_support: false + multus: + image: + tag: v4.3.0 + # ========== cni ========== + # cni_plugins binary (optional) + # cni_plugins_version: v1.2.0 + # ========== cni: calico ========== + # calicoctl binary + calico_version: v3.28.2 + # ========== cni: cilium ========== + # cilium helm + cilium_version: 1.18.3 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.13.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 4.2.0 + linux_utils_image: + tag: 4.2.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.3.0 +dns: + dns_image: + tag: v1.12.1 + dns_cache_image: + tag: 1.24.0 +image_manifests: + - docker.io/calico/apiserver:v3.28.2 + - docker.io/calico/cni:v3.28.2 + - docker.io/calico/ctl:v3.28.2 + - docker.io/calico/csi:v3.28.2 + - docker.io/calico/kube-controllers:v3.28.2 + - docker.io/calico/node-driver-registrar:v3.28.2 + - docker.io/calico/node:v3.28.2 + - docker.io/calico/pod2daemon-flexvol:v3.28.2 + - docker.io/calico/typha:v3.28.2 + - docker.io/kubesphere/coredns:v1.12.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/pause:3.10.1 + - docker.io/openebs/linux-utils:4.2.0 + - docker.io/openebs/provisioner-localpv:4.2.0 + - quay.io/tigera/operator:v1.34.5 + - docker.io/library/haproxy:2.9.6-alpine 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 ebb12725..ab75ad73 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 @@ -158,9 +158,6 @@ localAPIEndpoint: bindPort: {{ .kubernetes.apiserver.port }} nodeRegistration: criSocket: {{ .cri.cri_socket }} - kubeletExtraArgs: - cgroup-driver: {{ .cri.cgroup_driver }} - pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 @@ -210,6 +207,7 @@ 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 b594d9d3..beb85223 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 @@ -157,9 +157,6 @@ localAPIEndpoint: bindPort: {{ .kubernetes.apiserver.port }} nodeRegistration: criSocket: {{ .cri.cri_socket }} - kubeletExtraArgs: - cgroup-driver: {{ .cri.cgroup_driver }} - pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 @@ -209,6 +206,7 @@ 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/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 index c1fa0ef3..3f791c8f 100644 --- a/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 +++ b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 @@ -21,6 +21,3 @@ controlPlane: {{- end }} nodeRegistration: criSocket: {{ .cri.cri_socket }} - kubeletExtraArgs: - cgroup-driver: {{ .cri.cgroup_driver }} - pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" diff --git a/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 index 422d34d7..a9e556a1 100644 --- a/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 +++ b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 @@ -21,6 +21,3 @@ controlPlane: {{- end }} nodeRegistration: criSocket: {{ .cri.cri_socket }} - kubeletExtraArgs: - cgroup-driver: {{ .cri.cgroup_driver }} - pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" From 63a81978e382bb4c1f761fa329eb6d1440fb8fe8 Mon Sep 17 00:00:00 2001 From: cys158 Date: Thu, 25 Dec 2025 12:04:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BF=AE=E6=AD=A3k8s=201.3?= =?UTF-8?q?5.x=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 }} From 5dbdc0e0973bb8e40bb4239e7f36564777eccdbd Mon Sep 17 00:00:00 2001 From: cys158 Date: Thu, 25 Dec 2025 12:18:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"1=E3=80=81=E6=96=B0=E5=A2=9ERocky?= =?UTF-8?q?9.7/Rocky10.1=E7=B3=BB=E7=BB=9F=E9=83=A8=E7=BD=B2=E6=94=AF?= =?UTF-8?q?=E6=8C=81=EF=BC=9B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d55ddf0aaf57ffbe718676c3b1c2f510a9be374d. --- .../defaults/main/01-cluster_require.yaml | 2 - builtin/core/roles/defaults/vars/v1.34.yaml | 96 ------------------- builtin/core/roles/defaults/vars/v1.35.yaml | 96 ------------------- .../templates/kubeadm/kubeadm-init.v1beta2 | 4 +- .../templates/kubeadm/kubeadm-init.v1beta3 | 4 +- .../templates/kubeadm/kubeadm-join.v1beta2 | 3 + .../templates/kubeadm/kubeadm-join.v1beta3 | 3 + 7 files changed, 12 insertions(+), 196 deletions(-) delete mode 100644 builtin/core/roles/defaults/vars/v1.34.yaml delete mode 100644 builtin/core/roles/defaults/vars/v1.35.yaml diff --git a/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml b/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml index 0895f963..12ff29a0 100644 --- a/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml +++ b/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml @@ -12,8 +12,6 @@ cluster_require: - '"centos"' - kylin - '"kylin"' - - rocky - - '"rocky"' # Required network plugins require_network_plugin: ['calico', 'flannel', 'cilium', 'hybridnet', 'kube-ovn'] # Minimum supported Kubernetes version diff --git a/builtin/core/roles/defaults/vars/v1.34.yaml b/builtin/core/roles/defaults/vars/v1.34.yaml deleted file mode 100644 index 11dded53..00000000 --- a/builtin/core/roles/defaults/vars/v1.34.yaml +++ /dev/null @@ -1,96 +0,0 @@ -kubernetes: - # helm binary - helm_version: v3.18.5 -etcd: - # etcd binary - etcd_version: v3.5.25 -image_registry: - # ========== image registry ========== - # keepalived image tag. Used for load balancing when there are multiple image registry nodes. - keepalived_version: 2.0.20 - # ========== image registry: harbor ========== - # harbor image tag - harbor_version: v2.10.1 - # docker-compose binary - dockercompose_version: v2.20.3 - # ========== image registry: docker-registry ========== - # docker-registry image tag - docker_registry_version: 2.8.3 -cri: - # support: containerd,docker - container_manager: containerd - sandbox_image: - tag: "3.9" - # ========== cri ========== - # crictl binary - crictl_version: v1.33.0 - # ========== cri: docker ========== - # docker binary - docker_version: 24.0.7 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.1 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.7.6 - # runc binary - runc_version: v1.1.7 - # skip tls verify when pulling images - skip_tls_verify: false -cni: - type: calico - ipv6_support: false - multus: - image: - tag: v4.3.0 - # ========== cni ========== - # cni_plugins binary (optional) - # cni_plugins_version: v1.2.0 - # ========== cni: calico ========== - # calicoctl binary - calico_version: v3.28.2 - # ========== cni: cilium ========== - # cilium helm - cilium_version: 1.18.3 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.13.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 -storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 4.2.0 - linux_utils_image: - tag: 4.2.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.3.0 -dns: - dns_image: - tag: v1.12.1 - dns_cache_image: - tag: 1.24.0 -image_manifests: - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/csi:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/kubesphere/coredns:v1.12.1 - - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 - - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/pause:3.9 - - docker.io/openebs/linux-utils:4.2.0 - - docker.io/openebs/provisioner-localpv:4.2.0 - - quay.io/tigera/operator:v1.34.5 - - docker.io/library/haproxy:2.9.6-alpine diff --git a/builtin/core/roles/defaults/vars/v1.35.yaml b/builtin/core/roles/defaults/vars/v1.35.yaml deleted file mode 100644 index 2b2b1881..00000000 --- a/builtin/core/roles/defaults/vars/v1.35.yaml +++ /dev/null @@ -1,96 +0,0 @@ -kubernetes: - # helm binary - helm_version: v3.18.5 -etcd: - # etcd binary - etcd_version: v3.5.25 -image_registry: - # ========== image registry ========== - # keepalived image tag. Used for load balancing when there are multiple image registry nodes. - keepalived_version: 2.0.20 - # ========== image registry: harbor ========== - # harbor image tag - harbor_version: v2.10.1 - # docker-compose binary - dockercompose_version: v2.20.3 - # ========== image registry: docker-registry ========== - # docker-registry image tag - docker_registry_version: 2.8.3 -cri: - # support: containerd,docker - container_manager: containerd - sandbox_image: - tag: "3.10.1" - # ========== cri ========== - # crictl binary - crictl_version: v1.33.0 - # ========== cri: docker ========== - # docker binary - docker_version: 24.0.7 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.1 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.7.6 - # runc binary - runc_version: v1.1.7 - # skip tls verify when pulling images - skip_tls_verify: false -cni: - type: calico - ipv6_support: false - multus: - image: - tag: v4.3.0 - # ========== cni ========== - # cni_plugins binary (optional) - # cni_plugins_version: v1.2.0 - # ========== cni: calico ========== - # calicoctl binary - calico_version: v3.28.2 - # ========== cni: cilium ========== - # cilium helm - cilium_version: 1.18.3 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.13.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 -storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 4.2.0 - linux_utils_image: - tag: 4.2.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.3.0 -dns: - dns_image: - tag: v1.12.1 - dns_cache_image: - tag: 1.24.0 -image_manifests: - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/csi:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/kubesphere/coredns:v1.12.1 - - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 - - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - - docker.io/kubesphere/pause:3.10.1 - - docker.io/openebs/linux-utils:4.2.0 - - docker.io/openebs/provisioner-localpv:4.2.0 - - quay.io/tigera/operator:v1.34.5 - - docker.io/library/haproxy:2.9.6-alpine 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..ebb12725 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 @@ -158,6 +158,9 @@ localAPIEndpoint: bindPort: {{ .kubernetes.apiserver.port }} nodeRegistration: criSocket: {{ .cri.cri_socket }} + kubeletExtraArgs: + cgroup-driver: {{ .cri.cgroup_driver }} + pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 @@ -207,7 +210,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..b594d9d3 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 @@ -157,6 +157,9 @@ localAPIEndpoint: bindPort: {{ .kubernetes.apiserver.port }} nodeRegistration: criSocket: {{ .cri.cri_socket }} + kubeletExtraArgs: + cgroup-driver: {{ .cri.cgroup_driver }} + pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 @@ -206,7 +209,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/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 index 3f791c8f..c1fa0ef3 100644 --- a/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 +++ b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2 @@ -21,3 +21,6 @@ controlPlane: {{- end }} nodeRegistration: criSocket: {{ .cri.cri_socket }} + kubeletExtraArgs: + cgroup-driver: {{ .cri.cgroup_driver }} + pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}" diff --git a/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 index a9e556a1..422d34d7 100644 --- a/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 +++ b/builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3 @@ -21,3 +21,6 @@ controlPlane: {{- end }} nodeRegistration: criSocket: {{ .cri.cri_socket }} + kubeletExtraArgs: + cgroup-driver: {{ .cri.cgroup_driver }} + pod-infra-container-image: "{{ .cri.sandbox_image.registry }}/{{ .cri.sandbox_image.repository }}:{{ .cri.sandbox_image.tag }}"