15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: change k8s image tags and artifact func (#2729) 

Signed-off-by: xuesongzuo@yunify.com <xuesongzuo@yunify.com>
This commit is contained in:
zuoxuesong-worker 2025-08-27 17:56:57 +08:00 committed by GitHub
parent 3fa58f45ed
commit 24c80637ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 299 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
builtin/core/defaults/config/v1.23.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.24.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.25.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.26.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.27.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.28.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.29.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.30.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.31.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.32.yaml
View File

@ -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

52
builtin/core/defaults/config/v1.33.yaml
View File

@ -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

6
builtin/core/playbooks/artifact_images.yaml
View File

@ -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

9
builtin/core/roles/cri/docker/tasks/main.yaml
View File

@ -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"

1
builtin/core/roles/defaults/tasks/main.yaml
View File

@ -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

2
builtin/core/roles/download/tasks/images.yaml
View File

@ -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 }}"

2
builtin/core/roles/etcd/tasks/prepare.yaml
View File

@ -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 }}

2
cmd/kk/app/options/builtin/artifact.go
View File

@ -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")
}