External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-10-29 22:03:22 -02:30
Code Issues Packages Projects Releases Wiki Activity

Use upstream GHCR images for Flannel and its CNI plugin (#13672)

Browse Source 
* Use upstream GHCR images for Flannel and its CNI plugin

Signed-off-by: Kay Yan <kay.yan@daocloud.io>

* Remove redundant Flannel image documentation

Signed-off-by: Kay Yan <kay.yan@daocloud.io>

---------

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
This commit is contained in:
Kay Yan
2026-10-26 08:40:08 +00:00
committed by GitHub
parent dcd447a5f0
commit cb7ff78696
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/kubespray_defaults/defaults/main/download.yml
+3 -3
View File
@@ -211,9 +211,9 @@ skopeo_binary_checksum: "{{ skopeo_binary_checksums[image_arch][skopeo_version]
kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy" kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy"
etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd" etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd"
etcd_image_tag: "v{{ etcd_version }}" etcd_image_tag: "v{{ etcd_version }}"
flannel_image_repo: "{{ docker_image_repo }}/flannel/flannel" flannel_image_repo: "{{ github_image_repo }}/flannel-io/flannel"
flannel_image_tag: "{{ '' if flannel_version is version('0.28.6', '>=') and flannel_version is version('0.28.10', '<') else 'v' }}{{ flannel_version }}" flannel_image_tag: "v{{ flannel_version }}"
flannel_init_image_repo: "{{ docker_image_repo }}/flannel/flannel-cni-plugin" flannel_init_image_repo: "{{ github_image_repo }}/flannel-io/flannel-cni-plugin"
flannel_init_image_tag: "v{{ flannel_cni_version }}" flannel_init_image_tag: "v{{ flannel_cni_version }}"
calico_node_image_repo: "{{ quay_image_repo }}/calico/node" calico_node_image_repo: "{{ quay_image_repo }}/calico/node"
calico_node_image_tag: "v{{ calico_version }}" calico_node_image_tag: "v{{ calico_version }}"
tests/common_vars.yml
-3
View File
@@ -30,9 +30,6 @@ crio_registries:
nginx_image_repo: "{{ quay_image_repo }}/kubespray/nginx" nginx_image_repo: "{{ quay_image_repo }}/kubespray/nginx"
flannel_image_repo: "{{ quay_image_repo }}/kubespray/flannel"
flannel_init_image_repo: "{{ quay_image_repo }}/kubespray/flannel-cni-plugin"
local_release_dir: "{{ '/tmp/releases' if inventory_hostname != 'localhost' else (lookup('env', 'PWD') + '/downloads') }}" local_release_dir: "{{ '/tmp/releases' if inventory_hostname != 'localhost' else (lookup('env', 'PWD') + '/downloads') }}"
hydrophone_version: "0.7.0" hydrophone_version: "0.7.0"