diff --git a/builtin/core/defaults/config/v1.23.yaml b/builtin/core/defaults/config/v1.23.yaml index 744de1c0..e162de65 100644 --- a/builtin/core/defaults/config/v1.23.yaml +++ b/builtin/core/defaults/config/v1.23.yaml @@ -75,29 +75,29 @@ spec: 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/defaults/config/v1.24.yaml b/builtin/core/defaults/config/v1.24.yaml index b17cf732..5d143a7a 100644 --- a/builtin/core/defaults/config/v1.24.yaml +++ b/builtin/core/defaults/config/v1.24.yaml @@ -76,29 +76,29 @@ spec: 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/defaults/config/v1.25.yaml b/builtin/core/defaults/config/v1.25.yaml index bd01b5c5..dfbe8bda 100644 --- a/builtin/core/defaults/config/v1.25.yaml +++ b/builtin/core/defaults/config/v1.25.yaml @@ -76,29 +76,29 @@ spec: 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.5.0 + - docker.io/kubesphere/coredns:1.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 + - 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/defaults/config/v1.26.yaml b/builtin/core/defaults/config/v1.26.yaml index 1159149b..e6aa9c78 100644 --- a/builtin/core/defaults/config/v1.26.yaml +++ b/builtin/core/defaults/config/v1.26.yaml @@ -76,29 +76,29 @@ spec: 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.6.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/defaults/config/v1.27.yaml b/builtin/core/defaults/config/v1.27.yaml index 2124ec58..a22b90b1 100644 --- a/builtin/core/defaults/config/v1.27.yaml +++ b/builtin/core/defaults/config/v1.27.yaml @@ -76,29 +76,29 @@ spec: 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.7.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/defaults/config/v1.28.yaml b/builtin/core/defaults/config/v1.28.yaml index 5eb626d0..565eafc0 100644 --- a/builtin/core/defaults/config/v1.28.yaml +++ b/builtin/core/defaults/config/v1.28.yaml @@ -76,29 +76,29 @@ spec: 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.8.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/defaults/config/v1.29.yaml b/builtin/core/defaults/config/v1.29.yaml index 14980550..1fe7ff74 100644 --- a/builtin/core/defaults/config/v1.29.yaml +++ b/builtin/core/defaults/config/v1.29.yaml @@ -76,29 +76,29 @@ spec: 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.9.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/defaults/config/v1.30.yaml b/builtin/core/defaults/config/v1.30.yaml index 77c870e2..0adfe2d9 100644 --- a/builtin/core/defaults/config/v1.30.yaml +++ b/builtin/core/defaults/config/v1.30.yaml @@ -76,29 +76,29 @@ spec: 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/defaults/config/v1.31.yaml b/builtin/core/defaults/config/v1.31.yaml index a572e158..4edc01a6 100644 --- a/builtin/core/defaults/config/v1.31.yaml +++ b/builtin/core/defaults/config/v1.31.yaml @@ -76,29 +76,29 @@ spec: tag: v1.12.0 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.12.0 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - 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/defaults/config/v1.32.yaml b/builtin/core/defaults/config/v1.32.yaml index 7810a887..f3e86a63 100644 --- a/builtin/core/defaults/config/v1.32.yaml +++ b/builtin/core/defaults/config/v1.32.yaml @@ -76,29 +76,29 @@ spec: tag: v1.12.0 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.12.0 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.8 + - 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/defaults/config/v1.33.yaml b/builtin/core/defaults/config/v1.33.yaml index 87086538..32fcf56c 100644 --- a/builtin/core/defaults/config/v1.33.yaml +++ b/builtin/core/defaults/config/v1.33.yaml @@ -76,29 +76,29 @@ spec: tag: v1.13.0 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.13.0 + - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/pause:3.9 + - 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/playbooks/artifact_images.yaml b/builtin/core/playbooks/artifact_images.yaml index ae6cb23d..21a10ba8 100644 --- a/builtin/core/playbooks/artifact_images.yaml +++ b/builtin/core/playbooks/artifact_images.yaml @@ -3,7 +3,6 @@ - hosts: - all tags: ["always"] - gather_facts: true roles: - defaults @@ -11,7 +10,7 @@ - localhost tasks: - name: PullImage | Download container images - tags: ["pull"] + tags: ["pull","image_registry"] image: pull: images_dir: >- @@ -20,12 +19,13 @@ when: - .image_manifests | default list | empty | not - name: PushImage | Push images to registry - tags: ["push"] + tags: ["push","image_registry"] block: - name: PushImage | Ensure Harbor project exists for each image when: .image_registry.type | eq "harbor" command: | # Traverse first-level subdirectories in images_dir, skipping 'blobs' + for registry_dir in {{ .binary_dir }}/images/*; do if [ ! -d "$registry_dir" ] || [ "$(basename "$registry_dir")" = "blobs" ]; then continue diff --git a/builtin/core/roles/cri/docker/tasks/main.yaml b/builtin/core/roles/cri/docker/tasks/main.yaml index 2c3c086f..b15dc4bf 100644 --- a/builtin/core/roles/cri/docker/tasks/main.yaml +++ b/builtin/core/roles/cri/docker/tasks/main.yaml @@ -1,8 +1,4 @@ --- -# Docker | Install cri-dockerd if required for Kubernetes >= v1.24.0 -- include_tasks: cridockerd.yaml - when: - - .kubernetes.kube_version | semverCompare ">=v1.24.0" - name: Docker | Check if Docker is installed on the system ignore_errors: true @@ -61,3 +57,8 @@ {{ .image_registry.auth.key_file }} dest: >- /etc/docker/certs.d/{{ .image_registry.auth.registry }}/client.key + +# Docker | Install cri-dockerd if required for Kubernetes >= v1.24.0 +- include_tasks: cridockerd.yaml + when: + - .kubernetes.kube_version | semverCompare ">=v1.24.0" \ No newline at end of file diff --git a/builtin/core/roles/defaults/tasks/main.yaml b/builtin/core/roles/defaults/tasks/main.yaml index 22233d69..6c06e004 100644 --- a/builtin/core/roles/defaults/tasks/main.yaml +++ b/builtin/core/roles/defaults/tasks/main.yaml @@ -1,6 +1,7 @@ - name: Defaults | Load defaults based on Kubernetes version block: - name: Defaults | Load version-specific settings for Kubernetes + tags: ["image_registry"] when: .kubernetes.kube_version | empty | not include_vars: >- {{ slice (.kubernetes.kube_version | splitList ".") 0 2 | join "." }}.yaml diff --git a/builtin/core/roles/download/tasks/images.yaml b/builtin/core/roles/download/tasks/images.yaml index 674dd6ba..55a335ed 100644 --- a/builtin/core/roles/download/tasks/images.yaml +++ b/builtin/core/roles/download/tasks/images.yaml @@ -1,6 +1,8 @@ - name: Image | Download container images image: pull: + username: "{{ .image_registry.auth.username }}" + password: "{{ .image_registry.auth.password }}" images_dir: >- {{ .binary_dir }}/images/ manifests: "{{ .image_manifests | toJson }}" diff --git a/builtin/core/roles/etcd/tasks/prepare.yaml b/builtin/core/roles/etcd/tasks/prepare.yaml index efa09c4b..628a32e4 100644 --- a/builtin/core/roles/etcd/tasks/prepare.yaml +++ b/builtin/core/roles/etcd/tasks/prepare.yaml @@ -36,7 +36,7 @@ - name: Prepare | Ensure target etcd version is not lower than installed version when: .etcd_install_LoadState.stdout | eq "loaded" assert: - that: .etcd_version | semverCompare (printf ">=v%s" (index .etcd_install_version "stdout" "etcd Version")) + that: .etcd.etcd_version | semverCompare (printf ">=v%s" (index .etcd_install_version "stdout" "etcd Version")) fail_msg: >- Installed etcd version: {{ index .etcd_install_version "stdout" "etcd Version" }} is lower than target etcd version: {{ .etcd.etcd_version }} diff --git a/cmd/kk/app/options/builtin/artifact.go b/cmd/kk/app/options/builtin/artifact.go index aae6b4f9..38aa4e02 100644 --- a/cmd/kk/app/options/builtin/artifact.go +++ b/cmd/kk/app/options/builtin/artifact.go @@ -139,7 +139,7 @@ func (o *ArtifactImagesOptions) Complete(cmd *cobra.Command, args []string) (*kk } o.Playbook = args[0] - var tags []string + var tags = []string{"image_registry"} if o.Push { tags = append(tags, "push") }