From 2a4f516c721386040e4a8036b813aa153f775d64 Mon Sep 17 00:00:00 2001 From: liujian Date: Mon, 25 Aug 2025 11:16:16 +0800 Subject: [PATCH] fix: error format for kubernetes version file (#2723) Signed-off-by: redscholar --- builtin/core/roles/defaults/vars/v1.23.yaml | 195 ++++++++++--------- builtin/core/roles/defaults/vars/v1.24.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.25.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.26.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.27.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.28.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.29.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.30.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.31.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.32.yaml | 197 ++++++++++---------- builtin/core/roles/defaults/vars/v1.33.yaml | 197 ++++++++++---------- 11 files changed, 1066 insertions(+), 1099 deletions(-) diff --git a/builtin/core/roles/defaults/vars/v1.23.yaml b/builtin/core/roles/defaults/vars/v1.23.yaml index 0f535a07..f7b046c8 100644 --- a/builtin/core/roles/defaults/vars/v1.23.yaml +++ b/builtin/core/roles/defaults/vars/v1.23.yaml @@ -1,99 +1,96 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.8.2 - etcd: - # etcd binary - etcd_version: v3.5.4 - 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.6.3 - # docker-compose binary - dockercompose_version: v2.12.2 - # ========== image registry: docker-registry ========== - # docker-registry image tag - docker_registry_version: 2.8.3 - cri: - # support: containerd,docker - container_manager: docker - sandbox_image: - tag: "3.6" - # ========== cri ========== - # crictl binary - crictl_version: v1.23.0 - # ========== cri: docker ========== - # docker binary - docker_version: 20.10.18 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.10 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.6.8 - # runc binary - runc_version: v1.1.4 - cni: - multus: - image: - tag: v3.9.3 - # ========== cni ========== - # cni_plugins binary (optional) - # cni_plugins_version: v1.1.1 - # ========== cni: calico ========== - # calicoctl binary - calico_version: v3.24.5 - # ========== cni: cilium ========== - # cilium helm - cilium_version: 1.12.6 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.10.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 - storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 3.3.0 - linux_utils_image: - tag: 3.3.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.0.2 - dns: - dns_image: - tag: v1.8.6 - 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.22.20 - # - docker.io/openebs/provisioner-localpv:3.3.0 - # - docker.io/coredns/coredns:1.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 +kubernetes: + # helm binary + helm_version: v3.8.2 +etcd: + # etcd binary + etcd_version: v3.5.4 +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.6.3 + # docker-compose binary + dockercompose_version: v2.12.2 + # ========== image registry: docker-registry ========== + # docker-registry image tag + docker_registry_version: 2.8.3 +cri: + # support: containerd,docker + container_manager: docker + sandbox_image: + tag: "3.6" + # ========== cri ========== + # crictl binary + crictl_version: v1.23.0 + # ========== cri: docker ========== + # docker binary + docker_version: 20.10.18 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.10 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.6.8 + # runc binary + runc_version: v1.1.4 +cni: + multus: + image: + tag: v3.9.3 + # ========== cni ========== + # cni_plugins binary (optional) + # cni_plugins_version: v1.1.1 + # ========== cni: calico ========== + # calicoctl binary + calico_version: v3.24.5 + # ========== cni: cilium ========== + # cilium helm + cilium_version: 1.12.6 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.10.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 3.3.0 + linux_utils_image: + tag: 3.3.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.0.2 +dns: + dns_image: + tag: v1.8.6 + 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.22.20 +# - docker.io/openebs/provisioner-localpv:3.3.0 +# - docker.io/coredns/coredns:1.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 diff --git a/builtin/core/roles/defaults/vars/v1.24.yaml b/builtin/core/roles/defaults/vars/v1.24.yaml index 05249065..f987f39f 100644 --- a/builtin/core/roles/defaults/vars/v1.24.yaml +++ b/builtin/core/roles/defaults/vars/v1.24.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.10.3 - etcd: - # etcd binary - etcd_version: v3.5.6 - image_registry: - # ========== image registry ========== - # keepalived image tag. Used for load balancing when there are multiple image registry nodes. - keepalived_version: v2.0.20 - # ========== image registry: harbor ========== - # harbor image tag - harbor_version: v2.7.1 - # docker-compose binary - dockercompose_version: v2.14.0 - # ========== 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.6" - # ========== cri ========== - # crictl binary - crictl_version: v1.24.0 - # ========== cri: docker ========== - # docker binary - docker_version: 20.10.24 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.1 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.6.16 - # runc binary - runc_version: v1.1.4 - cni: - multus: - image: - tag: v3.10.1 - # ========== cni ========== - # cni_plugins binary (optional) - # cni_plugins_version: v1.1.1 - # ========== cni: calico ========== - # calicoctl binary - calico_version: v3.25.1 - # ========== cni: cilium ========== - # cilium helm - cilium_version: 1.13.5 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.10.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 - storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 3.4.0 - linux_utils_image: - tag: 3.4.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.0.2 - dns: - dns_image: - tag: v1.8.6 - 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.3.0 - # - docker.io/coredns/coredns:1.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 +kubernetes: + # helm binary + helm_version: v3.10.3 +etcd: + # etcd binary + etcd_version: v3.5.6 +image_registry: + # ========== image registry ========== + # keepalived image tag. Used for load balancing when there are multiple image registry nodes. + keepalived_version: v2.0.20 + # ========== image registry: harbor ========== + # harbor image tag + harbor_version: v2.7.1 + # docker-compose binary + dockercompose_version: v2.14.0 + # ========== 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.6" + # ========== cri ========== + # crictl binary + crictl_version: v1.24.0 + # ========== cri: docker ========== + # docker binary + docker_version: 20.10.24 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.1 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.6.16 + # runc binary + runc_version: v1.1.4 +cni: + multus: + image: + tag: v3.10.1 + # ========== cni ========== + # cni_plugins binary (optional) + # cni_plugins_version: v1.1.1 + # ========== cni: calico ========== + # calicoctl binary + calico_version: v3.25.1 + # ========== cni: cilium ========== + # cilium helm + cilium_version: 1.13.5 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.10.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 3.4.0 + linux_utils_image: + tag: 3.4.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.0.2 + dns: + dns_image: + tag: v1.8.6 + 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.3.0 +# - docker.io/coredns/coredns:1.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 diff --git a/builtin/core/roles/defaults/vars/v1.25.yaml b/builtin/core/roles/defaults/vars/v1.25.yaml index 79efaba5..36bd9dd2 100644 --- a/builtin/core/roles/defaults/vars/v1.25.yaml +++ b/builtin/core/roles/defaults/vars/v1.25.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.10.3 - etcd: - # etcd binary - etcd_version: v3.5.7 - 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.8.1 - # docker-compose binary - dockercompose_version: v2.15.1 - # ========== 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.6" - # ========== cri ========== - # crictl binary - crictl_version: v1.25.0 - # ========== cri: docker ========== - # docker binary - docker_version: 20.10.24 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.1 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.6.19 - # runc binary - runc_version: v1.1.4 - cni: - multus: - image: - tag: v3.11.3 - # ========== cni ========== - # cni_plugins binary (optional) - # cni_plugins_version: v1.1.1 - # ========== cni: calico ========== - # calicoctl binary - calico_version: v3.25.1 - # ========== cni: cilium ========== - # cilium helm - cilium_version: 1.13.5 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.10.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 - storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 3.5.0 - linux_utils_image: - tag: 3.5.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.0.8 - dns: - dns_image: - tag: v1.9.3 - 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.3.0 - # - docker.io/coredns/coredns:1.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 +kubernetes: + # helm binary + helm_version: v3.10.3 +etcd: + # etcd binary + etcd_version: v3.5.7 +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.8.1 + # docker-compose binary + dockercompose_version: v2.15.1 + # ========== 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.6" + # ========== cri ========== + # crictl binary + crictl_version: v1.25.0 + # ========== cri: docker ========== + # docker binary + docker_version: 20.10.24 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.1 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.6.19 + # runc binary + runc_version: v1.1.4 +cni: + multus: + image: + tag: v3.11.3 + # ========== cni ========== + # cni_plugins binary (optional) + # cni_plugins_version: v1.1.1 + # ========== cni: calico ========== + # calicoctl binary + calico_version: v3.25.1 + # ========== cni: cilium ========== + # cilium helm + cilium_version: 1.13.5 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.10.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 3.5.0 + linux_utils_image: + tag: 3.5.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.0.8 +dns: + dns_image: + tag: v1.9.3 + 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.3.0 +# - docker.io/coredns/coredns:1.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 diff --git a/builtin/core/roles/defaults/vars/v1.26.yaml b/builtin/core/roles/defaults/vars/v1.26.yaml index 4012912a..bc2637ca 100644 --- a/builtin/core/roles/defaults/vars/v1.26.yaml +++ b/builtin/core/roles/defaults/vars/v1.26.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.11.2 - etcd: - # etcd binary - etcd_version: v3.5.8 - 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.9.1 - # docker-compose binary - dockercompose_version: v2.16.0 - # ========== 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.7" - # ========== cri ========== - # crictl binary - crictl_version: v1.26.0 - # ========== cri: docker ========== - # docker binary - docker_version: 23.0.6 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.1 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.6.21 - # runc binary - runc_version: v1.1.5 - cni: - multus: - image: - tag: v4.0.2 - # ========== cni ========== - # cni_plugins binary (optional) - # cni_plugins_version: v1.2.0 - # ========== cni: calico ========== - # calicoctl binary - calico_version: v3.26.1 - # ========== cni: cilium ========== - # cilium helm - cilium_version: 1.13.5 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.10.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 - storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 3.6.0 - linux_utils_image: - tag: 3.6.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.0.8 - dns: - dns_image: - tag: v1.9.3 - 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.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.11.2 +etcd: + # etcd binary + etcd_version: v3.5.8 +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.9.1 + # docker-compose binary + dockercompose_version: v2.16.0 + # ========== 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.7" + # ========== cri ========== + # crictl binary + crictl_version: v1.26.0 + # ========== cri: docker ========== + # docker binary + docker_version: 23.0.6 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.1 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.6.21 + # runc binary + runc_version: v1.1.5 +cni: + multus: + image: + tag: v4.0.2 + # ========== cni ========== + # cni_plugins binary (optional) + # cni_plugins_version: v1.2.0 + # ========== cni: calico ========== + # calicoctl binary + calico_version: v3.26.1 + # ========== cni: cilium ========== + # cilium helm + cilium_version: 1.13.5 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.10.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 3.6.0 + linux_utils_image: + tag: 3.6.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.0.8 +dns: + dns_image: + tag: v1.9.3 + 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.3.0 +# - docker.io/coredns/coredns:1.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.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 diff --git a/builtin/core/roles/defaults/vars/v1.27.yaml b/builtin/core/roles/defaults/vars/v1.27.yaml index 871157f8..a97bc4a9 100644 --- a/builtin/core/roles/defaults/vars/v1.27.yaml +++ b/builtin/core/roles/defaults/vars/v1.27.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.12.1 - etcd: - # etcd binary - etcd_version: v3.5.9 - 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.7" - # ========== cri ========== - # crictl binary - crictl_version: v1.27.0 - # ========== cri: docker ========== - # docker binary - docker_version: 23.0.6 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.1 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.7.2 - # runc binary - runc_version: v1.1.7 - cni: - multus: - image: - tag: v4.0.2 - # ========== cni ========== - # cni_plugins binary (optional) - # cni_plugins_version: v1.2.0 - # ========== cni: calico ========== - # calicoctl binary - calico_version: v3.26.1 - # ========== cni: cilium ========== - # cilium helm - cilium_version: 1.14.2 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.11.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 - storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 3.7.0 - linux_utils_image: - tag: 3.7.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.0.10 - dns: - dns_image: - tag: v1.10.1 - 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.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.12.1 +etcd: + # etcd binary + etcd_version: v3.5.9 +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.7" + # ========== cri ========== + # crictl binary + crictl_version: v1.27.0 + # ========== cri: docker ========== + # docker binary + docker_version: 23.0.6 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.1 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.7.2 + # runc binary + runc_version: v1.1.7 +cni: + multus: + image: + tag: v4.0.2 + # ========== cni ========== + # cni_plugins binary (optional) + # cni_plugins_version: v1.2.0 + # ========== cni: calico ========== + # calicoctl binary + calico_version: v3.26.1 + # ========== cni: cilium ========== + # cilium helm + cilium_version: 1.14.2 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.11.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 3.7.0 + linux_utils_image: + tag: 3.7.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.0.10 +dns: + dns_image: + tag: v1.10.1 + 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.3.0 +# - docker.io/coredns/coredns:1.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.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 diff --git a/builtin/core/roles/defaults/vars/v1.28.yaml b/builtin/core/roles/defaults/vars/v1.28.yaml index 347120ab..409af07f 100644 --- a/builtin/core/roles/defaults/vars/v1.28.yaml +++ b/builtin/core/roles/defaults/vars/v1.28.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.12.1 - etcd: - # etcd binary - etcd_version: v3.5.9 - 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.8" - # ========== cri ========== - # crictl binary - crictl_version: v1.28.0 - # ========== cri: docker ========== - # docker binary - docker_version: 24.0.6 - # cridockerd. Required when kube_version is greater than 1.24 - cridockerd_version: v0.3.1 - # ========== cri: containerd ========== - # containerd binary - containerd_version: v1.7.3 - # runc binary - runc_version: v1.1.7 - cni: - multus: - image: - tag: v4.1.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.15.0 - # ========== cni: kubeovn ========== - # kubeovn helm - kubeovn_version: 1.12.0 - # ========== cni: hybridnet ========== - # hybridnet helm - hybridnet_version: 0.6.8 - storage_class: - # ========== storageclass ========== - # ========== storageclass: local ========== - local: - provisioner_image: - tag: 3.8.0 - linux_utils_image: - tag: 3.8.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.0.10 - dns: - dns_image: - tag: v1.10.1 - 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.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.12.1 +etcd: + # etcd binary + etcd_version: v3.5.9 +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.8" + # ========== cri ========== + # crictl binary + crictl_version: v1.28.0 + # ========== cri: docker ========== + # docker binary + docker_version: 24.0.6 + # cridockerd. Required when kube_version is greater than 1.24 + cridockerd_version: v0.3.1 + # ========== cri: containerd ========== + # containerd binary + containerd_version: v1.7.3 + # runc binary + runc_version: v1.1.7 +cni: + multus: + image: + tag: v4.1.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.15.0 + # ========== cni: kubeovn ========== + # kubeovn helm + kubeovn_version: 1.12.0 + # ========== cni: hybridnet ========== + # hybridnet helm + hybridnet_version: 0.6.8 +storage_class: + # ========== storageclass ========== + # ========== storageclass: local ========== + local: + provisioner_image: + tag: 3.8.0 + linux_utils_image: + tag: 3.8.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.0.10 +dns: + dns_image: + tag: v1.10.1 + 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.3.0 +# - docker.io/coredns/coredns:1.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.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 diff --git a/builtin/core/roles/defaults/vars/v1.29.yaml b/builtin/core/roles/defaults/vars/v1.29.yaml index 639e7316..c523cb3d 100644 --- a/builtin/core/roles/defaults/vars/v1.29.yaml +++ b/builtin/core/roles/defaults/vars/v1.29.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.13.3 - etcd: - # etcd binary - etcd_version: v3.5.10 - 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.8" - # ========== cri ========== - # crictl binary - crictl_version: v1.29.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 - cni: - multus: - image: - tag: v4.1.1 - # ========== 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.15.4 - # ========== 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: 3.9.0 - linux_utils_image: - tag: 3.9.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.1.0 - dns: - dns_image: - tag: v1.11.1 - 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.22.20 - # - docker.io/openebs/provisioner-localpv:3.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.13.3 +etcd: + # etcd binary + etcd_version: v3.5.10 +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.8" + # ========== cri ========== + # crictl binary + crictl_version: v1.29.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 +cni: + multus: + image: + tag: v4.1.1 + # ========== 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.15.4 + # ========== 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: 3.9.0 + linux_utils_image: + tag: 3.9.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.1.0 +dns: + dns_image: + tag: v1.11.1 + 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.22.20 +# - docker.io/openebs/provisioner-localpv:3.3.0 +# - docker.io/coredns/coredns:1.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.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 diff --git a/builtin/core/roles/defaults/vars/v1.30.yaml b/builtin/core/roles/defaults/vars/v1.30.yaml index bd2f5655..1b25dc56 100644 --- a/builtin/core/roles/defaults/vars/v1.30.yaml +++ b/builtin/core/roles/defaults/vars/v1.30.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.13.3 - etcd: - # etcd binary - etcd_version: v3.5.10 - 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.8" - # ========== cri ========== - # crictl binary - crictl_version: v1.30.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 - cni: - multus: - image: - tag: v4.2.1 - # ========== 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.15.4 - # ========== 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.0.0 - linux_utils_image: - tag: 4.0.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.1.0 - dns: - dns_image: - tag: v1.11.1 - 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.22.20 - # - docker.io/openebs/provisioner-localpv:3.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.13.3 +etcd: + # etcd binary + etcd_version: v3.5.10 +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.8" + # ========== cri ========== + # crictl binary + crictl_version: v1.30.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 +cni: + multus: + image: + tag: v4.2.1 + # ========== 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.15.4 + # ========== 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.0.0 + linux_utils_image: + tag: 4.0.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.1.0 +dns: + dns_image: + tag: v1.11.1 + 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.22.20 +# - docker.io/openebs/provisioner-localpv:3.3.0 +# - docker.io/coredns/coredns:1.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.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 diff --git a/builtin/core/roles/defaults/vars/v1.31.yaml b/builtin/core/roles/defaults/vars/v1.31.yaml index 8ba1b54d..cf992ff2 100644 --- a/builtin/core/roles/defaults/vars/v1.31.yaml +++ b/builtin/core/roles/defaults/vars/v1.31.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.13.3 - etcd: - # etcd binary - etcd_version: v3.5.11 - 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.8" - # ========== cri ========== - # crictl binary - crictl_version: v1.31.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 - cni: - multus: - image: - tag: v4.2.1 - # ========== 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.15.4 - # ========== 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.1.0 - linux_utils_image: - tag: 4.1.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.2.0 - dns: - dns_image: - tag: v1.11.1 - 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.22.20 - # - docker.io/openebs/provisioner-localpv:3.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.13.3 +etcd: + # etcd binary + etcd_version: v3.5.11 +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.8" + # ========== cri ========== + # crictl binary + crictl_version: v1.31.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 +cni: + multus: + image: + tag: v4.2.1 + # ========== 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.15.4 + # ========== 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.1.0 + linux_utils_image: + tag: 4.1.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.2.0 +dns: + dns_image: + tag: v1.11.1 + 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.22.20 +# - docker.io/openebs/provisioner-localpv:3.3.0 +# - docker.io/coredns/coredns:1.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.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 diff --git a/builtin/core/roles/defaults/vars/v1.32.yaml b/builtin/core/roles/defaults/vars/v1.32.yaml index 9effaee2..94a4f630 100644 --- a/builtin/core/roles/defaults/vars/v1.32.yaml +++ b/builtin/core/roles/defaults/vars/v1.32.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.14.3 - etcd: - # etcd binary - etcd_version: v3.5.11 - 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.8" - # ========== cri ========== - # crictl binary - crictl_version: v1.32.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 - cni: - 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.15.4 - # ========== 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.2.0 - dns: - dns_image: - tag: v1.11.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/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.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.14.3 +etcd: + # etcd binary + etcd_version: v3.5.11 +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.8" + # ========== cri ========== + # crictl binary + crictl_version: v1.32.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 +cni: + 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.15.4 + # ========== 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.2.0 +dns: + dns_image: + tag: v1.11.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/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.3.0 +# - docker.io/coredns/coredns:1.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.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 diff --git a/builtin/core/roles/defaults/vars/v1.33.yaml b/builtin/core/roles/defaults/vars/v1.33.yaml index 5718b49c..5088a4d8 100644 --- a/builtin/core/roles/defaults/vars/v1.33.yaml +++ b/builtin/core/roles/defaults/vars/v1.33.yaml @@ -1,100 +1,97 @@ -apiVersion: kubekey.kubesphere.io/v1 -kind: Config -spec: - kubernetes: - # helm binary - helm_version: v3.18.5 - etcd: - # etcd binary - etcd_version: v3.5.11 - 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 - cni: - 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.15.4 - # ========== 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.3.0 - linux_utils_image: - tag: 4.3.0 - # ========== storageclass: nfs ========== - # nfs provisioner helm version - nfs_provisioner_version: 4.3.0 - dns: - dns_image: - tag: v1.11.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/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.3.0 - # - docker.io/coredns/coredns:1.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.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 +kubernetes: + # helm binary + helm_version: v3.18.5 +etcd: + # etcd binary + etcd_version: v3.5.11 +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 +cni: + 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.15.4 + # ========== 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.3.0 + linux_utils_image: + tag: 4.3.0 + # ========== storageclass: nfs ========== + # nfs provisioner helm version + nfs_provisioner_version: 4.3.0 +dns: + dns_image: + tag: v1.11.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/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.3.0 +# - docker.io/coredns/coredns:1.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.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