diff --git a/builtin/core/defaults/config/v1.25.yaml b/builtin/core/defaults/config/v1.25.yaml index dfbe8bda..3241d317 100644 --- a/builtin/core/defaults/config/v1.25.yaml +++ b/builtin/core/defaults/config/v1.25.yaml @@ -65,9 +65,9 @@ spec: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.5.0 + tag: 3.4.0 linux_utils_image: - tag: 3.5.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.8 @@ -85,13 +85,13 @@ spec: - 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.5.0 - - docker.io/kubesphere/coredns:1.9.3 + - docker.io/openebs/provisioner-localpv: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.8 + - 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 diff --git a/builtin/core/defaults/config/v1.26.yaml b/builtin/core/defaults/config/v1.26.yaml index e6aa9c78..e10139d8 100644 --- a/builtin/core/defaults/config/v1.26.yaml +++ b/builtin/core/defaults/config/v1.26.yaml @@ -65,9 +65,9 @@ spec: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.6.0 + tag: 3.4.0 linux_utils_image: - tag: 3.6.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.8 @@ -85,7 +85,7 @@ spec: - 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.6.0 + - docker.io/openebs/provisioner-localpv: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 }} diff --git a/builtin/core/defaults/config/v1.27.yaml b/builtin/core/defaults/config/v1.27.yaml index a22b90b1..17b6fa55 100644 --- a/builtin/core/defaults/config/v1.27.yaml +++ b/builtin/core/defaults/config/v1.27.yaml @@ -65,9 +65,9 @@ spec: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.7.0 + tag: 3.4.0 linux_utils_image: - tag: 3.7.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.10 @@ -85,7 +85,7 @@ spec: - 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.7.0 + - docker.io/openebs/provisioner-localpv: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 }} diff --git a/builtin/core/defaults/config/v1.28.yaml b/builtin/core/defaults/config/v1.28.yaml index 565eafc0..8f326691 100644 --- a/builtin/core/defaults/config/v1.28.yaml +++ b/builtin/core/defaults/config/v1.28.yaml @@ -65,9 +65,9 @@ spec: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.8.0 + tag: 3.4.0 linux_utils_image: - tag: 3.8.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.10 @@ -85,7 +85,7 @@ spec: - 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.8.0 + - docker.io/openebs/provisioner-localpv: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 }} diff --git a/builtin/core/defaults/config/v1.29.yaml b/builtin/core/defaults/config/v1.29.yaml index 1fe7ff74..adb90084 100644 --- a/builtin/core/defaults/config/v1.29.yaml +++ b/builtin/core/defaults/config/v1.29.yaml @@ -65,9 +65,9 @@ spec: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.9.0 + tag: 3.4.0 linux_utils_image: - tag: 3.9.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.1.0 @@ -85,7 +85,7 @@ spec: - 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.9.0 + - docker.io/openebs/provisioner-localpv:3.4.0 - docker.io/kubesphere/coredns:v1.11.1 - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} diff --git a/builtin/core/defaults/config/v1.31.yaml b/builtin/core/defaults/config/v1.31.yaml index 4edc01a6..c6abfcde 100644 --- a/builtin/core/defaults/config/v1.31.yaml +++ b/builtin/core/defaults/config/v1.31.yaml @@ -73,7 +73,7 @@ spec: nfs_provisioner_version: 4.2.0 dns: dns_image: - tag: v1.12.0 + tag: v1.11.1 dns_cache_image: tag: 1.23.1 image_manifests: @@ -86,7 +86,7 @@ spec: - 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/kubesphere/coredns:v1.12.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 }} diff --git a/builtin/core/defaults/config/v1.32.yaml b/builtin/core/defaults/config/v1.32.yaml index f3e86a63..a8a9b9f1 100644 --- a/builtin/core/defaults/config/v1.32.yaml +++ b/builtin/core/defaults/config/v1.32.yaml @@ -73,7 +73,7 @@ spec: nfs_provisioner_version: 4.2.0 dns: dns_image: - tag: v1.12.0 + tag: v1.11.1 dns_cache_image: tag: 1.24.0 image_manifests: @@ -86,7 +86,7 @@ spec: - 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/kubesphere/coredns:v1.12.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 }} diff --git a/builtin/core/defaults/config/v1.33.yaml b/builtin/core/defaults/config/v1.33.yaml index 32fcf56c..8052a453 100644 --- a/builtin/core/defaults/config/v1.33.yaml +++ b/builtin/core/defaults/config/v1.33.yaml @@ -73,7 +73,7 @@ spec: nfs_provisioner_version: 4.3.0 dns: dns_image: - tag: v1.13.0 + tag: v1.12.1 dns_cache_image: tag: 1.24.0 image_manifests: @@ -86,7 +86,7 @@ spec: - docker.io/calico/pod2daemon-flexvol:v3.28.2 - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 - docker.io/openebs/provisioner-localpv:4.3.0 - - docker.io/kubesphere/coredns:v1.13.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 }} diff --git a/builtin/core/roles/cri/containerd/tasks/main.yaml b/builtin/core/roles/cri/containerd/tasks/main.yaml index aa02a482..cfb9c04b 100644 --- a/builtin/core/roles/cri/containerd/tasks/main.yaml +++ b/builtin/core/roles/cri/containerd/tasks/main.yaml @@ -51,14 +51,18 @@ dest: >- /etc/containerd/certs.d/{{ .image_registry.auth.registry }}/ca.crt - name: Containerd | Copy image registry server certificate to the remote node - when: .image_registry.auth.cert_file | empty | not + when: + - .image_registry.auth.cert_file | empty | not + - .image_registry.auth.cert_file | fileExist copy: src: >- {{ .image_registry.auth.cert_file }} dest: >- /etc/containerd/certs.d/{{ .image_registry.auth.registry }}/server.crt - name: Containerd | Copy image registry server key to the remote node - when: .image_registry.auth.key_file | empty | not + when: + - .image_registry.auth.key_file | empty | not + - .image_registry.auth.key_file | fileExist copy: src: >- {{ .image_registry.auth.key_file }} diff --git a/builtin/core/roles/cri/docker/tasks/main.yaml b/builtin/core/roles/cri/docker/tasks/main.yaml index b15dc4bf..6de85e0c 100644 --- a/builtin/core/roles/cri/docker/tasks/main.yaml +++ b/builtin/core/roles/cri/docker/tasks/main.yaml @@ -44,14 +44,18 @@ dest: >- /etc/docker/certs.d/{{ .image_registry.auth.registry }}/ca.crt - name: Docker | Copy image registry server certificate to the remote node - when: .image_registry.auth.cert_file | empty | not + when: + - .image_registry.auth.cert_file | empty | not + - .image_registry.auth.cert_file | fileExist copy: src: >- {{ .image_registry.auth.cert_file }} dest: >- /etc/docker/certs.d/{{ .image_registry.auth.registry }}/client.cert - name: Docker | Copy image registry server key to the remote node - when: .image_registry.auth.key_file | empty | not + when: + - .image_registry.auth.key_file | empty | not + - .image_registry.auth.key_file | fileExist copy: src: >- {{ .image_registry.auth.key_file }} diff --git a/builtin/core/roles/defaults/vars/v1.23.yaml b/builtin/core/roles/defaults/vars/v1.23.yaml index f7b046c8..f69e4c31 100644 --- a/builtin/core/roles/defaults/vars/v1.23.yaml +++ b/builtin/core/roles/defaults/vars/v1.23.yaml @@ -68,29 +68,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.24.yaml b/builtin/core/roles/defaults/vars/v1.24.yaml index f987f39f..770e6533 100644 --- a/builtin/core/roles/defaults/vars/v1.24.yaml +++ b/builtin/core/roles/defaults/vars/v1.24.yaml @@ -69,29 +69,29 @@ storage_class: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.25.yaml b/builtin/core/roles/defaults/vars/v1.25.yaml index 36bd9dd2..7c37c3b7 100644 --- a/builtin/core/roles/defaults/vars/v1.25.yaml +++ b/builtin/core/roles/defaults/vars/v1.25.yaml @@ -58,9 +58,9 @@ storage_class: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.5.0 + tag: 3.4.0 linux_utils_image: - tag: 3.5.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.8 @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.26.yaml b/builtin/core/roles/defaults/vars/v1.26.yaml index bc2637ca..2af186a6 100644 --- a/builtin/core/roles/defaults/vars/v1.26.yaml +++ b/builtin/core/roles/defaults/vars/v1.26.yaml @@ -58,9 +58,9 @@ storage_class: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.6.0 + tag: 3.4.0 linux_utils_image: - tag: 3.6.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.8 @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.27.yaml b/builtin/core/roles/defaults/vars/v1.27.yaml index a97bc4a9..d0a23a50 100644 --- a/builtin/core/roles/defaults/vars/v1.27.yaml +++ b/builtin/core/roles/defaults/vars/v1.27.yaml @@ -58,9 +58,9 @@ storage_class: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.7.0 + tag: 3.4.0 linux_utils_image: - tag: 3.7.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.10 @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.28.yaml b/builtin/core/roles/defaults/vars/v1.28.yaml index 409af07f..7683f58f 100644 --- a/builtin/core/roles/defaults/vars/v1.28.yaml +++ b/builtin/core/roles/defaults/vars/v1.28.yaml @@ -58,9 +58,9 @@ storage_class: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.8.0 + tag: 3.4.0 linux_utils_image: - tag: 3.8.0 + tag: 3.4.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.0.10 @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.29.yaml b/builtin/core/roles/defaults/vars/v1.29.yaml index c523cb3d..d4dd1b11 100644 --- a/builtin/core/roles/defaults/vars/v1.29.yaml +++ b/builtin/core/roles/defaults/vars/v1.29.yaml @@ -58,9 +58,9 @@ storage_class: # ========== storageclass: local ========== local: provisioner_image: - tag: 3.9.0 + tag: 3.5.0 linux_utils_image: - tag: 3.9.0 + tag: 3.5.0 # ========== storageclass: nfs ========== # nfs provisioner helm version nfs_provisioner_version: 4.1.0 @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.30.yaml b/builtin/core/roles/defaults/vars/v1.30.yaml index 1b25dc56..21df60fe 100644 --- a/builtin/core/roles/defaults/vars/v1.30.yaml +++ b/builtin/core/roles/defaults/vars/v1.30.yaml @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.31.yaml b/builtin/core/roles/defaults/vars/v1.31.yaml index cf992ff2..a1aefd80 100644 --- a/builtin/core/roles/defaults/vars/v1.31.yaml +++ b/builtin/core/roles/defaults/vars/v1.31.yaml @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.32.yaml b/builtin/core/roles/defaults/vars/v1.32.yaml index 94a4f630..4463836d 100644 --- a/builtin/core/roles/defaults/vars/v1.32.yaml +++ b/builtin/core/roles/defaults/vars/v1.32.yaml @@ -69,29 +69,29 @@ dns: 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 + 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/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 diff --git a/builtin/core/roles/defaults/vars/v1.33.yaml b/builtin/core/roles/defaults/vars/v1.33.yaml index 5088a4d8..ce87b3d7 100644 --- a/builtin/core/roles/defaults/vars/v1.33.yaml +++ b/builtin/core/roles/defaults/vars/v1.33.yaml @@ -69,29 +69,29 @@ dns: 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 + 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.3.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.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 diff --git a/docs/zh/004-task.md b/docs/zh/004-task.md index 4af6c4d9..08f64905 100644 --- a/docs/zh/004-task.md +++ b/docs/zh/004-task.md @@ -67,4 +67,5 @@ task执行时, 会在定义的host分别上执行. - [result](modules/result.md) - [set_fact](modules/set_fact.md) - [setup](modules/setup.md) -- [template](modules/template.md) \ No newline at end of file +- [template](modules/template.md) +- [include_vars](modules/include_vars.md) \ No newline at end of file diff --git a/docs/zh/101-syntax.md b/docs/zh/101-syntax.md index fe91f70e..5f2d36f9 100644 --- a/docs/zh/101-syntax.md +++ b/docs/zh/101-syntax.md @@ -40,3 +40,10 @@ # 返回一个新列表,该列表中的元素在a中存在,但在b中不存在 {{ .b | subtractList .a }} ``` + +## fileExist +数组不包含 +```yaml +# 判断文件是否存在 +{{ .file_path | fileExist }} +``` \ No newline at end of file diff --git a/pkg/converter/tmpl/functions.go b/pkg/converter/tmpl/functions.go index 859768b3..0d949b39 100644 --- a/pkg/converter/tmpl/functions.go +++ b/pkg/converter/tmpl/functions.go @@ -3,6 +3,7 @@ package tmpl import ( "math" "net" + "os" "strings" "text/template" @@ -26,6 +27,7 @@ func funcMap() template.FuncMap { f["ipFamily"] = ipFamily f["pow"] = pow f["subtractList"] = subtractList + f["fileExist"] = fileExist return f } @@ -107,3 +109,8 @@ func subtractList(a, b []any) ([]any, error) { return result, nil } + +func fileExist(path string) bool { + _, err := os.Stat(path) + return err == nil +}