From 2776e1073457025ba8535a3f45f07707e4827f48 Mon Sep 17 00:00:00 2001 From: yangjinheng <420123641@qq.com> Date: Wed, 29 Oct 2025 10:43:10 +0800 Subject: [PATCH] delete duplicate image names and add default configuration (#2819) * delete duplicate image names and add default configuration Signed-off-by: redscholar * Update CNI configurations and image manifests across multiple versions - Updated Cilium version to 1.18.3 in various configuration files. - Added Calico control plane images (ctl and typha) to image manifests for consistency. - Ensured proper formatting for kube_version placeholders in YAML files. - Removed duplicate image entries and ensured all necessary images are included in the manifests. Signed-off-by: redscholar --------- Signed-off-by: redscholar Co-authored-by: yangjinheng Co-authored-by: redscholar --- builtin/core/defaults/config/v1.23.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.24.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.25.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.26.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.27.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.28.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.29.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.30.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.31.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.32.yaml | 47 ++++++++--------- builtin/core/defaults/config/v1.33.yaml | 51 +++++++++---------- .../roles/defaults/defaults/main/04-cni.yaml | 4 +- builtin/core/roles/defaults/vars/v1.23.yaml | 47 ++++++++--------- builtin/core/roles/defaults/vars/v1.24.yaml | 51 +++++++++---------- builtin/core/roles/defaults/vars/v1.25.yaml | 49 ++++++++---------- builtin/core/roles/defaults/vars/v1.26.yaml | 49 ++++++++---------- builtin/core/roles/defaults/vars/v1.27.yaml | 46 +++++++---------- builtin/core/roles/defaults/vars/v1.28.yaml | 47 ++++++++--------- builtin/core/roles/defaults/vars/v1.29.yaml | 47 ++++++++--------- builtin/core/roles/defaults/vars/v1.30.yaml | 47 ++++++++--------- builtin/core/roles/defaults/vars/v1.31.yaml | 48 ++++++++--------- builtin/core/roles/defaults/vars/v1.32.yaml | 49 ++++++++---------- builtin/core/roles/defaults/vars/v1.33.yaml | 49 ++++++++---------- 23 files changed, 456 insertions(+), 598 deletions(-) diff --git a/builtin/core/defaults/config/v1.23.yaml b/builtin/core/defaults/config/v1.23.yaml index 2a7efb67..b3fa171b 100644 --- a/builtin/core/defaults/config/v1.23.yaml +++ b/builtin/core/defaults/config/v1.23.yaml @@ -52,7 +52,7 @@ spec: calico_version: v3.24.5 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.12.6 + cilium_version: 1.14.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -76,29 +76,22 @@ spec: dns_cache_image: tag: 1.21.1 image_manifests: - - docker.io/calico/apiserver:v3.24.5 - - docker.io/calico/cni:v3.24.5 - - docker.io/calico/csi:v3.24.5 - - docker.io/calico/kube-controllers:v3.24.5 - - docker.io/calico/node-driver-registrar:v3.24.5 - - docker.io/calico/node:v3.24.5 - - docker.io/calico/pod2daemon-flexvol:v3.24.5 - - docker.io/kubesphere/k8s-dns-node-cache:1.21.1 - - docker.io/openebs/provisioner-localpv:3.3.0 - - docker.io/openebs/linux-utils:3.3.0 - - docker.io/kubesphere/coredns:v1.8.6 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.6 - - quay.io/tigera/operator:v1.28.5 - - docker.io/calico/ctl:v3.24.5 - - docker.io/calico/typha:v3.24.5 - - docker.io/calico/apiserver:v3.24.5 - - docker.io/calico/kube-controllers:v3.24.5 - - docker.io/calico/node:v3.24.5 - - docker.io/calico/pod2daemon-flexvol:v3.24.5 - - docker.io/calico/cni:v3.24.5 - - docker.io/calico/node-driver-registrar:v3.24.5 - - docker.io/calico/csi:v3.24.5 + - docker.io/calico/apiserver:v3.24.5 + - docker.io/calico/cni:v3.24.5 + - docker.io/calico/ctl:v3.24.5 + - docker.io/calico/csi:v3.24.5 + - docker.io/calico/kube-controllers:v3.24.5 + - docker.io/calico/node-driver-registrar:v3.24.5 + - docker.io/calico/node:v3.24.5 + - docker.io/calico/pod2daemon-flexvol:v3.24.5 + - docker.io/calico/typha:v3.24.5 + - docker.io/kubesphere/coredns:v1.8.6 + - docker.io/kubesphere/k8s-dns-node-cache:1.21.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.6 + - docker.io/openebs/linux-utils:3.3.0 + - docker.io/openebs/provisioner-localpv:3.3.0 + - quay.io/tigera/operator:v1.28.5 diff --git a/builtin/core/defaults/config/v1.24.yaml b/builtin/core/defaults/config/v1.24.yaml index b15aee48..210fb4be 100644 --- a/builtin/core/defaults/config/v1.24.yaml +++ b/builtin/core/defaults/config/v1.24.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.25.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.13.5 + cilium_version: 1.14.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.22.20 image_manifests: - - docker.io/calico/apiserver:v3.25.1 - - docker.io/calico/cni:v3.25.1 - - docker.io/calico/csi:v3.25.1 - - docker.io/calico/kube-controllers:v3.25.1 - - docker.io/calico/node-driver-registrar:v3.25.1 - - docker.io/calico/node:v3.25.1 - - docker.io/calico/pod2daemon-flexvol:v3.25.1 - - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/openebs/provisioner-localpv:3.4.0 - - docker.io/openebs/linux-utils:3.4.0 - - docker.io/kubesphere/coredns:v1.8.6 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.6 - - quay.io/tigera/operator:v1.29.3 - - docker.io/calico/ctl:v3.25.1 - - docker.io/calico/typha:v3.25.1 - - docker.io/calico/apiserver:v3.25.1 - - docker.io/calico/kube-controllers:v3.25.1 - - docker.io/calico/node:v3.25.1 - - docker.io/calico/pod2daemon-flexvol:v3.25.1 - - docker.io/calico/cni:v3.25.1 - - docker.io/calico/node-driver-registrar:v3.25.1 - - docker.io/calico/csi:v3.25.1 + - docker.io/calico/apiserver:v3.25.1 + - docker.io/calico/cni:v3.25.1 + - docker.io/calico/ctl:v3.25.1 + - docker.io/calico/csi:v3.25.1 + - docker.io/calico/kube-controllers:v3.25.1 + - docker.io/calico/node-driver-registrar:v3.25.1 + - docker.io/calico/node:v3.25.1 + - docker.io/calico/pod2daemon-flexvol:v3.25.1 + - docker.io/calico/typha:v3.25.1 + - docker.io/kubesphere/coredns:v1.8.6 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.6 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.29.3 diff --git a/builtin/core/defaults/config/v1.25.yaml b/builtin/core/defaults/config/v1.25.yaml index 8d8f7f82..f5341602 100644 --- a/builtin/core/defaults/config/v1.25.yaml +++ b/builtin/core/defaults/config/v1.25.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.25.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.13.5 + cilium_version: 1.14.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.22.20 image_manifests: - - docker.io/calico/apiserver:v3.25.1 - - docker.io/calico/cni:v3.25.1 - - docker.io/calico/csi:v3.25.1 - - docker.io/calico/kube-controllers:v3.25.1 - - docker.io/calico/node-driver-registrar:v3.25.1 - - docker.io/calico/node:v3.25.1 - - docker.io/calico/pod2daemon-flexvol:v3.25.1 - - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/openebs/provisioner-localpv:3.4.0 - - docker.io/openebs/linux-utils:3.4.0 - - docker.io/kubesphere/coredns:v1.9.3 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.6 - - quay.io/tigera/operator:v1.29.3 - - docker.io/calico/ctl:v3.25.1 - - docker.io/calico/typha:v3.25.1 - - docker.io/calico/apiserver:v3.25.1 - - docker.io/calico/kube-controllers:v3.25.1 - - docker.io/calico/node:v3.25.1 - - docker.io/calico/pod2daemon-flexvol:v3.25.1 - - docker.io/calico/cni:v3.25.1 - - docker.io/calico/node-driver-registrar:v3.25.1 - - docker.io/calico/csi:v3.25.1 + - docker.io/calico/apiserver:v3.25.1 + - docker.io/calico/cni:v3.25.1 + - docker.io/calico/ctl:v3.25.1 + - docker.io/calico/csi:v3.25.1 + - docker.io/calico/kube-controllers:v3.25.1 + - docker.io/calico/node-driver-registrar:v3.25.1 + - docker.io/calico/node:v3.25.1 + - docker.io/calico/pod2daemon-flexvol:v3.25.1 + - docker.io/calico/typha:v3.25.1 + - docker.io/kubesphere/coredns:v1.9.3 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.6 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.29.3 diff --git a/builtin/core/defaults/config/v1.26.yaml b/builtin/core/defaults/config/v1.26.yaml index 61a6431f..115f530a 100644 --- a/builtin/core/defaults/config/v1.26.yaml +++ b/builtin/core/defaults/config/v1.26.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.26.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.13.5 + cilium_version: 1.15.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.22.20 image_manifests: - - docker.io/calico/apiserver:v3.26.1 - - docker.io/calico/cni:v3.26.1 - - docker.io/calico/csi:v3.26.1 - - docker.io/calico/kube-controllers:v3.26.1 - - docker.io/calico/node-driver-registrar:v3.26.1 - - docker.io/calico/node:v3.26.1 - - docker.io/calico/pod2daemon-flexvol:v3.26.1 - - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/openebs/provisioner-localpv:3.4.0 - - docker.io/openebs/linux-utils:3.4.0 - - docker.io/kubesphere/coredns:v1.9.3 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.7 - - quay.io/tigera/operator:v1.30.4 - - docker.io/calico/ctl:v3.26.1 - - docker.io/calico/typha:v3.26.1 - - docker.io/calico/apiserver:v3.26.1 - - docker.io/calico/kube-controllers:v3.26.1 - - docker.io/calico/node:v3.26.1 - - docker.io/calico/pod2daemon-flexvol:v3.26.1 - - docker.io/calico/cni:v3.26.1 - - docker.io/calico/node-driver-registrar:v3.26.1 - - docker.io/calico/csi:v3.26.1 + - docker.io/calico/apiserver:v3.26.1 + - docker.io/calico/cni:v3.26.1 + - docker.io/calico/ctl:v3.26.1 + - docker.io/calico/csi:v3.26.1 + - docker.io/calico/kube-controllers:v3.26.1 + - docker.io/calico/node-driver-registrar:v3.26.1 + - docker.io/calico/node:v3.26.1 + - docker.io/calico/pod2daemon-flexvol:v3.26.1 + - docker.io/calico/typha:v3.26.1 + - docker.io/kubesphere/coredns:v1.9.3 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.7 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.30.4 diff --git a/builtin/core/defaults/config/v1.27.yaml b/builtin/core/defaults/config/v1.27.yaml index 02641d4f..373aa771 100644 --- a/builtin/core/defaults/config/v1.27.yaml +++ b/builtin/core/defaults/config/v1.27.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.26.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.14.2 + cilium_version: 1.16.16 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.11.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.22.20 image_manifests: - - docker.io/calico/apiserver:v3.26.1 - - docker.io/calico/cni:v3.26.1 - - docker.io/calico/csi:v3.26.1 - - docker.io/calico/kube-controllers:v3.26.1 - - docker.io/calico/node-driver-registrar:v3.26.1 - - docker.io/calico/node:v3.26.1 - - docker.io/calico/pod2daemon-flexvol:v3.26.1 - - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/openebs/provisioner-localpv:3.4.0 - - docker.io/openebs/linux-utils:3.4.0 - - docker.io/kubesphere/coredns:v1.10.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.7 - - quay.io/tigera/operator:v1.30.4 - - docker.io/calico/ctl:v3.26.1 - - docker.io/calico/typha:v3.26.1 - - docker.io/calico/apiserver:v3.26.1 - - docker.io/calico/kube-controllers:v3.26.1 - - docker.io/calico/node:v3.26.1 - - docker.io/calico/pod2daemon-flexvol:v3.26.1 - - docker.io/calico/cni:v3.26.1 - - docker.io/calico/node-driver-registrar:v3.26.1 - - docker.io/calico/csi:v3.26.1 + - docker.io/calico/apiserver:v3.26.1 + - docker.io/calico/cni:v3.26.1 + - docker.io/calico/ctl:v3.26.1 + - docker.io/calico/csi:v3.26.1 + - docker.io/calico/kube-controllers:v3.26.1 + - docker.io/calico/node-driver-registrar:v3.26.1 + - docker.io/calico/node:v3.26.1 + - docker.io/calico/pod2daemon-flexvol:v3.26.1 + - docker.io/calico/typha:v3.26.1 + - docker.io/kubesphere/coredns:v1.10.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.7 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.30.4 diff --git a/builtin/core/defaults/config/v1.28.yaml b/builtin/core/defaults/config/v1.28.yaml index 3747f29f..6b2b953c 100644 --- a/builtin/core/defaults/config/v1.28.yaml +++ b/builtin/core/defaults/config/v1.28.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.0 + cilium_version: 1.16.16 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.12.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.22.20 image_manifests: - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/openebs/provisioner-localpv:3.4.0 - - docker.io/openebs/linux-utils:3.4.0 - - docker.io/kubesphere/coredns:v1.10.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.8 - - quay.io/tigera/operator:v1.34.5 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/csi:v3.28.2 + - 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.10.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/defaults/config/v1.29.yaml b/builtin/core/defaults/config/v1.29.yaml index 9d5ec79b..1b3a416d 100644 --- a/builtin/core/defaults/config/v1.29.yaml +++ b/builtin/core/defaults/config/v1.29.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.17.9 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.23.1 image_manifests: - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.23.1 - - docker.io/openebs/provisioner-localpv:3.5.0 - - docker.io/openebs/linux-utils:3.5.0 - - docker.io/kubesphere/coredns:v1.11.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.8 - - quay.io/tigera/operator:v1.34.5 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:3.5.0 + - docker.io/openebs/provisioner-localpv:3.5.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/defaults/config/v1.30.yaml b/builtin/core/defaults/config/v1.30.yaml index 3960ef77..bb5e56a1 100644 --- a/builtin/core/defaults/config/v1.30.yaml +++ b/builtin/core/defaults/config/v1.30.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.23.1 image_manifests: - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.23.1 - - docker.io/openebs/provisioner-localpv:4.0.0 - - docker.io/openebs/linux-utils:4.0.0 - - docker.io/kubesphere/coredns:v1.11.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.8 - - quay.io/tigera/operator:v1.34.5 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:4.0.0 + - docker.io/openebs/provisioner-localpv:4.0.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/defaults/config/v1.31.yaml b/builtin/core/defaults/config/v1.31.yaml index 43d1c4c8..ef7e0746 100644 --- a/builtin/core/defaults/config/v1.31.yaml +++ b/builtin/core/defaults/config/v1.31.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -77,29 +77,22 @@ spec: dns_cache_image: tag: 1.23.1 image_manifests: - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.23.1 - - docker.io/openebs/provisioner-localpv:4.1.0 - - docker.io/openebs/linux-utils:4.1.0 - - docker.io/kubesphere/coredns:v1.11.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.8 - - quay.io/tigera/operator:v1.34.5 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:4.1.0 + - docker.io/openebs/provisioner-localpv:4.1.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/defaults/config/v1.32.yaml b/builtin/core/defaults/config/v1.32.yaml index f5fbfbc0..596481ee 100644 --- a/builtin/core/defaults/config/v1.32.yaml +++ b/builtin/core/defaults/config/v1.32.yaml @@ -53,7 +53,7 @@ spec: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -77,29 +77,22 @@ spec: 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/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/kubesphere/k8s-dns-node-cache:1.24.0 - - docker.io/openebs/provisioner-localpv:4.2.0 - - docker.io/openebs/linux-utils:4.2.0 - - docker.io/kubesphere/coredns:v1.11.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.8 - - quay.io/tigera/operator:v1.34.5 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:4.2.0 + - docker.io/openebs/provisioner-localpv:4.2.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/defaults/config/v1.33.yaml b/builtin/core/defaults/config/v1.33.yaml index abbe5537..1c13f3fc 100644 --- a/builtin/core/defaults/config/v1.33.yaml +++ b/builtin/core/defaults/config/v1.33.yaml @@ -5,7 +5,7 @@ spec: # if set as "cn", so that online downloads will try to use available domestic sources whenever possible. zone: "" kubernetes: - kube_version: {{ .kube_version }} + kube_version: { { .kube_version } } # helm binary helm_version: v3.18.5 etcd: @@ -42,6 +42,8 @@ spec: # runc binary runc_version: v1.1.7 cni: + type: cilium + ipv6_support: false multus: image: tag: v4.3.0 @@ -53,7 +55,7 @@ spec: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -77,29 +79,22 @@ spec: 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/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/kubesphere/k8s-dns-node-cache:1.24.0 - - docker.io/openebs/provisioner-localpv:4.2.0 - - docker.io/openebs/linux-utils:4.2.0 - - docker.io/kubesphere/coredns:v1.12.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} - - docker.io/kubesphere/pause:3.9 - - quay.io/tigera/operator:v1.34.5 - - docker.io/calico/ctl:v3.28.2 - - docker.io/calico/typha:v3.28.2 - - docker.io/calico/apiserver:v3.28.2 - - docker.io/calico/kube-controllers:v3.28.2 - - docker.io/calico/node:v3.28.2 - - docker.io/calico/pod2daemon-flexvol:v3.28.2 - - docker.io/calico/cni:v3.28.2 - - docker.io/calico/node-driver-registrar:v3.28.2 - - docker.io/calico/csi:v3.28.2 + - 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:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .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 diff --git a/builtin/core/roles/defaults/defaults/main/04-cni.yaml b/builtin/core/roles/defaults/defaults/main/04-cni.yaml index 6e963a56..4ec62b36 100644 --- a/builtin/core/roles/defaults/defaults/main/04-cni.yaml +++ b/builtin/core/roles/defaults/defaults/main/04-cni.yaml @@ -32,10 +32,10 @@ cni: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 # ========== cni: hybridnet ========== # hybridnet helm - hybridnet_version: 0.6.8 \ No newline at end of file + hybridnet_version: 0.6.8 diff --git a/builtin/core/roles/defaults/vars/v1.23.yaml b/builtin/core/roles/defaults/vars/v1.23.yaml index b166c491..c080d884 100644 --- a/builtin/core/roles/defaults/vars/v1.23.yaml +++ b/builtin/core/roles/defaults/vars/v1.23.yaml @@ -45,7 +45,7 @@ cni: calico_version: v3.24.5 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.12.6 + cilium_version: 1.14.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -69,29 +69,22 @@ dns: dns_cache_image: tag: 1.21.1 image_manifests: -- docker.io/calico/apiserver:v3.24.5 -- docker.io/calico/cni:v3.24.5 -- docker.io/calico/csi:v3.24.5 -- docker.io/calico/kube-controllers:v3.24.5 -- docker.io/calico/node-driver-registrar:v3.24.5 -- docker.io/calico/node:v3.24.5 -- docker.io/calico/pod2daemon-flexvol:v3.24.5 -- docker.io/kubesphere/k8s-dns-node-cache:1.21.1 -- docker.io/openebs/provisioner-localpv:3.3.0 -- docker.io/openebs/linux-utils:3.3.0 -- docker.io/kubesphere/coredns:v1.8.6 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.6 -- quay.io/tigera/operator:v1.28.5 -- docker.io/calico/ctl:v3.24.5 -- docker.io/calico/typha:v3.24.5 -- docker.io/calico/apiserver:v3.24.5 -- docker.io/calico/kube-controllers:v3.24.5 -- docker.io/calico/node:v3.24.5 -- docker.io/calico/pod2daemon-flexvol:v3.24.5 -- docker.io/calico/cni:v3.24.5 -- docker.io/calico/node-driver-registrar:v3.24.5 -- docker.io/calico/csi:v3.24.5 + - docker.io/calico/apiserver:v3.24.5 + - docker.io/calico/cni:v3.24.5 + - docker.io/calico/ctl:v3.24.5 + - docker.io/calico/csi:v3.24.5 + - docker.io/calico/kube-controllers:v3.24.5 + - docker.io/calico/node-driver-registrar:v3.24.5 + - docker.io/calico/node:v3.24.5 + - docker.io/calico/pod2daemon-flexvol:v3.24.5 + - docker.io/calico/typha:v3.24.5 + - docker.io/kubesphere/coredns:v1.8.6 + - docker.io/kubesphere/k8s-dns-node-cache:1.21.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.6 + - docker.io/openebs/linux-utils:3.3.0 + - docker.io/openebs/provisioner-localpv:3.3.0 + - quay.io/tigera/operator:v1.28.5 diff --git a/builtin/core/roles/defaults/vars/v1.24.yaml b/builtin/core/roles/defaults/vars/v1.24.yaml index d0ec7898..77ef61b4 100644 --- a/builtin/core/roles/defaults/vars/v1.24.yaml +++ b/builtin/core/roles/defaults/vars/v1.24.yaml @@ -17,6 +17,8 @@ image_registry: # docker-registry image tag docker_registry_version: 2.8.3 cri: + type: calico + ipv6_support: false # support: containerd,docker container_manager: containerd sandbox_image: @@ -46,7 +48,7 @@ cni: calico_version: v3.25.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.13.5 + cilium_version: 1.14.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -68,31 +70,24 @@ storage_class: dns_image: tag: v1.8.6 dns_cache_image: - tag: 1.22.20 + tag: 1.22.20 image_manifests: -- docker.io/calico/apiserver:v3.25.1 -- docker.io/calico/cni:v3.25.1 -- docker.io/calico/csi:v3.25.1 -- docker.io/calico/kube-controllers:v3.25.1 -- docker.io/calico/node-driver-registrar:v3.25.1 -- docker.io/calico/node:v3.25.1 -- docker.io/calico/pod2daemon-flexvol:v3.25.1 -- docker.io/kubesphere/k8s-dns-node-cache:1.22.20 -- docker.io/openebs/provisioner-localpv:3.4.0 -- docker.io/openebs/linux-utils:3.4.0 -- docker.io/kubesphere/coredns:v1.8.6 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.6 -- quay.io/tigera/operator:v1.29.3 -- docker.io/calico/ctl:v3.25.1 -- docker.io/calico/typha:v3.25.1 -- docker.io/calico/apiserver:v3.25.1 -- docker.io/calico/kube-controllers:v3.25.1 -- docker.io/calico/node:v3.25.1 -- docker.io/calico/pod2daemon-flexvol:v3.25.1 -- docker.io/calico/cni:v3.25.1 -- docker.io/calico/node-driver-registrar:v3.25.1 -- docker.io/calico/csi:v3.25.1 + - docker.io/calico/apiserver:v3.25.1 + - docker.io/calico/cni:v3.25.1 + - docker.io/calico/ctl:v3.25.1 + - docker.io/calico/csi:v3.25.1 + - docker.io/calico/kube-controllers:v3.25.1 + - docker.io/calico/node-driver-registrar:v3.25.1 + - docker.io/calico/node:v3.25.1 + - docker.io/calico/pod2daemon-flexvol:v3.25.1 + - docker.io/calico/typha:v3.25.1 + - docker.io/kubesphere/coredns:v1.8.6 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.6 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.29.3 diff --git a/builtin/core/roles/defaults/vars/v1.25.yaml b/builtin/core/roles/defaults/vars/v1.25.yaml index 58620efc..6d1e7791 100644 --- a/builtin/core/roles/defaults/vars/v1.25.yaml +++ b/builtin/core/roles/defaults/vars/v1.25.yaml @@ -35,6 +35,8 @@ cri: # runc binary runc_version: v1.1.4 cni: + type: calico + ipv6_support: false multus: image: tag: v3.11.3 @@ -46,7 +48,7 @@ cni: calico_version: v3.25.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.13.5 + cilium_version: 1.14.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -70,29 +72,22 @@ dns: dns_cache_image: tag: 1.22.20 image_manifests: -- docker.io/calico/apiserver:v3.25.1 -- docker.io/calico/cni:v3.25.1 -- docker.io/calico/csi:v3.25.1 -- docker.io/calico/kube-controllers:v3.25.1 -- docker.io/calico/node-driver-registrar:v3.25.1 -- docker.io/calico/node:v3.25.1 -- docker.io/calico/pod2daemon-flexvol:v3.25.1 -- docker.io/kubesphere/k8s-dns-node-cache:1.22.20 -- docker.io/openebs/provisioner-localpv:3.4.0 -- docker.io/openebs/linux-utils:3.4.0 -- docker.io/kubesphere/coredns:v1.9.3 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.6 -- quay.io/tigera/operator:v1.29.3 -- docker.io/calico/ctl:v3.25.1 -- docker.io/calico/typha:v3.25.1 -- docker.io/calico/apiserver:v3.25.1 -- docker.io/calico/kube-controllers:v3.25.1 -- docker.io/calico/node:v3.25.1 -- docker.io/calico/pod2daemon-flexvol:v3.25.1 -- docker.io/calico/cni:v3.25.1 -- docker.io/calico/node-driver-registrar:v3.25.1 -- docker.io/calico/csi:v3.25.1 + - docker.io/calico/apiserver:v3.25.1 + - docker.io/calico/cni:v3.25.1 + - docker.io/calico/ctl:v3.25.1 + - docker.io/calico/csi:v3.25.1 + - docker.io/calico/kube-controllers:v3.25.1 + - docker.io/calico/node-driver-registrar:v3.25.1 + - docker.io/calico/node:v3.25.1 + - docker.io/calico/pod2daemon-flexvol:v3.25.1 + - docker.io/calico/typha:v3.25.1 + - docker.io/kubesphere/coredns:v1.9.3 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.6 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.29.3 diff --git a/builtin/core/roles/defaults/vars/v1.26.yaml b/builtin/core/roles/defaults/vars/v1.26.yaml index b16352ef..1aa15018 100644 --- a/builtin/core/roles/defaults/vars/v1.26.yaml +++ b/builtin/core/roles/defaults/vars/v1.26.yaml @@ -35,6 +35,8 @@ cri: # runc binary runc_version: v1.1.5 cni: + type: calico + ipv6_support: false multus: image: tag: v4.0.2 @@ -46,7 +48,7 @@ cni: calico_version: v3.26.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.13.5 + cilium_version: 1.15.19 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.10.0 @@ -70,29 +72,22 @@ dns: dns_cache_image: tag: 1.22.20 image_manifests: -- docker.io/calico/apiserver:v3.26.1 -- docker.io/calico/cni:v3.26.1 -- docker.io/calico/csi:v3.26.1 -- docker.io/calico/kube-controllers:v3.26.1 -- docker.io/calico/node-driver-registrar:v3.26.1 -- docker.io/calico/node:v3.26.1 -- docker.io/calico/pod2daemon-flexvol:v3.26.1 -- docker.io/kubesphere/k8s-dns-node-cache:1.22.20 -- docker.io/openebs/provisioner-localpv:3.4.0 -- docker.io/openebs/linux-utils:3.4.0 -- docker.io/kubesphere/coredns:v1.9.3 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.7 -- quay.io/tigera/operator:v1.30.4 -- docker.io/calico/ctl:v3.26.1 -- docker.io/calico/typha:v3.26.1 -- docker.io/calico/apiserver:v3.26.1 -- docker.io/calico/kube-controllers:v3.26.1 -- docker.io/calico/node:v3.26.1 -- docker.io/calico/pod2daemon-flexvol:v3.26.1 -- docker.io/calico/cni:v3.26.1 -- docker.io/calico/node-driver-registrar:v3.26.1 -- docker.io/calico/csi:v3.26.1 + - docker.io/calico/apiserver:v3.26.1 + - docker.io/calico/cni:v3.26.1 + - docker.io/calico/ctl:v3.26.1 + - docker.io/calico/csi:v3.26.1 + - docker.io/calico/kube-controllers:v3.26.1 + - docker.io/calico/node-driver-registrar:v3.26.1 + - docker.io/calico/node:v3.26.1 + - docker.io/calico/pod2daemon-flexvol:v3.26.1 + - docker.io/calico/typha:v3.26.1 + - docker.io/kubesphere/coredns:v1.9.3 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.7 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.30.4 diff --git a/builtin/core/roles/defaults/vars/v1.27.yaml b/builtin/core/roles/defaults/vars/v1.27.yaml index 3da56bcb..d9250c31 100644 --- a/builtin/core/roles/defaults/vars/v1.27.yaml +++ b/builtin/core/roles/defaults/vars/v1.27.yaml @@ -46,7 +46,7 @@ cni: calico_version: v3.26.1 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.14.2 + cilium_version: 1.16.16 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.11.0 @@ -70,29 +70,21 @@ dns: dns_cache_image: tag: 1.22.20 image_manifests: -- docker.io/calico/apiserver:v3.26.1 -- docker.io/calico/cni:v3.26.1 -- docker.io/calico/csi:v3.26.1 -- docker.io/calico/kube-controllers:v3.26.1 -- docker.io/calico/node-driver-registrar:v3.26.1 -- docker.io/calico/node:v3.26.1 -- docker.io/calico/pod2daemon-flexvol:v3.26.1 -- docker.io/kubesphere/k8s-dns-node-cache:1.22.20 -- docker.io/openebs/provisioner-localpv:3.4.0 -- docker.io/openebs/linux-utils:3.4.0 -- docker.io/kubesphere/coredns:v1.10.1 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.7 -- quay.io/tigera/operator:v1.30.4 -- docker.io/calico/ctl:v3.26.1 -- docker.io/calico/typha:v3.26.1 -- docker.io/calico/apiserver:v3.26.1 -- docker.io/calico/kube-controllers:v3.26.1 -- docker.io/calico/node:v3.26.1 -- docker.io/calico/pod2daemon-flexvol:v3.26.1 -- docker.io/calico/cni:v3.26.1 -- docker.io/calico/node-driver-registrar:v3.26.1 -- docker.io/calico/csi:v3.26.1 + - docker.io/calico/cni:v3.26.1 + - docker.io/calico/ctl:v3.26.1 + - docker.io/calico/csi:v3.26.1 + - docker.io/calico/kube-controllers:v3.26.1 + - docker.io/calico/node-driver-registrar:v3.26.1 + - docker.io/calico/node:v3.26.1 + - docker.io/calico/pod2daemon-flexvol:v3.26.1 + - docker.io/calico/typha:v3.26.1 + - docker.io/kubesphere/coredns:v1.10.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.7 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.30.4 diff --git a/builtin/core/roles/defaults/vars/v1.28.yaml b/builtin/core/roles/defaults/vars/v1.28.yaml index 3fc8245e..2328e832 100644 --- a/builtin/core/roles/defaults/vars/v1.28.yaml +++ b/builtin/core/roles/defaults/vars/v1.28.yaml @@ -46,7 +46,7 @@ cni: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.0 + cilium_version: 1.16.16 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.12.0 @@ -70,29 +70,22 @@ dns: dns_cache_image: tag: 1.22.20 image_manifests: -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.22.20 -- docker.io/openebs/provisioner-localpv:3.4.0 -- docker.io/openebs/linux-utils:3.4.0 -- docker.io/kubesphere/coredns:v1.10.1 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.8 -- quay.io/tigera/operator:v1.34.5 -- docker.io/calico/ctl:v3.28.2 -- docker.io/calico/typha:v3.28.2 -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/kube-controllers:v3.28.2 -- docker.io/calico/node:v3.28.2 -- docker.io/calico/pod2daemon-flexvol:v3.28.2 -- docker.io/calico/cni:v3.28.2 -- docker.io/calico/node-driver-registrar:v3.28.2 -- docker.io/calico/csi:v3.28.2 + - 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.10.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:3.4.0 + - docker.io/openebs/provisioner-localpv:3.4.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/roles/defaults/vars/v1.29.yaml b/builtin/core/roles/defaults/vars/v1.29.yaml index c058c531..eb1f3f01 100644 --- a/builtin/core/roles/defaults/vars/v1.29.yaml +++ b/builtin/core/roles/defaults/vars/v1.29.yaml @@ -46,7 +46,7 @@ cni: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.17.9 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -70,29 +70,22 @@ dns: dns_cache_image: tag: 1.23.1 image_manifests: -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.23.1 -- docker.io/openebs/provisioner-localpv:3.5.0 -- docker.io/openebs/linux-utils:3.5.0 -- docker.io/kubesphere/coredns:v1.11.1 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.8 -- quay.io/tigera/operator:v1.34.5 -- docker.io/calico/ctl:v3.28.2 -- docker.io/calico/typha:v3.28.2 -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/kube-controllers:v3.28.2 -- docker.io/calico/node:v3.28.2 -- docker.io/calico/pod2daemon-flexvol:v3.28.2 -- docker.io/calico/cni:v3.28.2 -- docker.io/calico/node-driver-registrar:v3.28.2 -- docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:3.5.0 + - docker.io/openebs/provisioner-localpv:3.5.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/roles/defaults/vars/v1.30.yaml b/builtin/core/roles/defaults/vars/v1.30.yaml index 21ce5679..bbecd3ff 100644 --- a/builtin/core/roles/defaults/vars/v1.30.yaml +++ b/builtin/core/roles/defaults/vars/v1.30.yaml @@ -46,7 +46,7 @@ cni: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -70,29 +70,22 @@ dns: dns_cache_image: tag: 1.23.1 image_manifests: -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.23.1 -- docker.io/openebs/provisioner-localpv:4.0.0 -- docker.io/openebs/linux-utils:4.0.0 -- docker.io/kubesphere/coredns:v1.11.1 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.8 -- quay.io/tigera/operator:v1.34.5 -- docker.io/calico/ctl:v3.28.2 -- docker.io/calico/typha:v3.28.2 -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/kube-controllers:v3.28.2 -- docker.io/calico/node:v3.28.2 -- docker.io/calico/pod2daemon-flexvol:v3.28.2 -- docker.io/calico/cni:v3.28.2 -- docker.io/calico/node-driver-registrar:v3.28.2 -- docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:4.0.0 + - docker.io/openebs/provisioner-localpv:4.0.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/roles/defaults/vars/v1.31.yaml b/builtin/core/roles/defaults/vars/v1.31.yaml index 71d4de25..f72b235e 100644 --- a/builtin/core/roles/defaults/vars/v1.31.yaml +++ b/builtin/core/roles/defaults/vars/v1.31.yaml @@ -46,7 +46,7 @@ cni: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -70,29 +70,23 @@ dns: dns_cache_image: tag: 1.23.1 image_manifests: -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/cni: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/kubesphere/k8s-dns-node-cache:1.23.1 -- docker.io/openebs/provisioner-localpv:4.1.0 -- docker.io/openebs/linux-utils:4.1.0 -- docker.io/kubesphere/coredns:v1.11.1 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.8 -- quay.io/tigera/operator:v1.34.5 -- docker.io/calico/ctl:v3.28.2 -- docker.io/calico/typha:v3.28.2 -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/kube-controllers:v3.28.2 -- docker.io/calico/node:v3.28.2 -- docker.io/calico/pod2daemon-flexvol:v3.28.2 -- docker.io/calico/cni:v3.28.2 -- docker.io/calico/node-driver-registrar:v3.28.2 -- docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:4.1.0 + - docker.io/openebs/provisioner-localpv:4.1.0 + - quay.io/tigera/operator:v1.34.5 + diff --git a/builtin/core/roles/defaults/vars/v1.32.yaml b/builtin/core/roles/defaults/vars/v1.32.yaml index bb13e43e..bfd38072 100644 --- a/builtin/core/roles/defaults/vars/v1.32.yaml +++ b/builtin/core/roles/defaults/vars/v1.32.yaml @@ -35,6 +35,8 @@ cri: # runc binary runc_version: v1.1.7 cni: + type: calico + ipv6_support: false multus: image: tag: v4.3.0 @@ -46,7 +48,7 @@ cni: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -70,29 +72,22 @@ dns: 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/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/kubesphere/k8s-dns-node-cache:1.24.0 -- docker.io/openebs/provisioner-localpv:4.2.0 -- docker.io/openebs/linux-utils:4.2.0 -- docker.io/kubesphere/coredns:v1.11.1 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.8 -- quay.io/tigera/operator:v1.34.5 -- docker.io/calico/ctl:v3.28.2 -- docker.io/calico/typha:v3.28.2 -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/kube-controllers:v3.28.2 -- docker.io/calico/node:v3.28.2 -- docker.io/calico/pod2daemon-flexvol:v3.28.2 -- docker.io/calico/cni:v3.28.2 -- docker.io/calico/node-driver-registrar:v3.28.2 -- docker.io/calico/csi:v3.28.2 + - 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.11.1 + - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - docker.io/openebs/linux-utils:4.2.0 + - docker.io/openebs/provisioner-localpv:4.2.0 + - quay.io/tigera/operator:v1.34.5 diff --git a/builtin/core/roles/defaults/vars/v1.33.yaml b/builtin/core/roles/defaults/vars/v1.33.yaml index c223e5dc..459dfabe 100644 --- a/builtin/core/roles/defaults/vars/v1.33.yaml +++ b/builtin/core/roles/defaults/vars/v1.33.yaml @@ -35,6 +35,8 @@ cri: # runc binary runc_version: v1.1.7 cni: + type: calico + ipv6_support: false multus: image: tag: v4.3.0 @@ -46,7 +48,7 @@ cni: calico_version: v3.28.2 # ========== cni: cilium ========== # cilium helm - cilium_version: 1.15.4 + cilium_version: 1.18.3 # ========== cni: kubeovn ========== # kubeovn helm kubeovn_version: 1.13.0 @@ -70,29 +72,22 @@ dns: 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/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/kubesphere/k8s-dns-node-cache:1.24.0 -- docker.io/openebs/provisioner-localpv:4.2.0 -- docker.io/openebs/linux-utils:4.2.0 -- docker.io/kubesphere/coredns:v1.12.1 -- docker.io/kubesphere/kube-apiserver:{{ .kube_version }} -- docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} -- docker.io/kubesphere/kube-proxy:{{ .kube_version }} -- docker.io/kubesphere/kube-scheduler:{{ .kube_version }} -- docker.io/kubesphere/pause:3.9 -- quay.io/tigera/operator:v1.34.5 -- docker.io/calico/ctl:v3.28.2 -- docker.io/calico/typha:v3.28.2 -- docker.io/calico/apiserver:v3.28.2 -- docker.io/calico/kube-controllers:v3.28.2 -- docker.io/calico/node:v3.28.2 -- docker.io/calico/pod2daemon-flexvol:v3.28.2 -- docker.io/calico/cni:v3.28.2 -- docker.io/calico/node-driver-registrar:v3.28.2 -- docker.io/calico/csi:v3.28.2 + - 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:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .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