upgrade flannel v0.26.4

buxiaomo · Feb 6, 2025 · e803b2f · e803b2f
1 parent 0196d92
commit e803b2f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/roles/add-on/templates/flannel.yaml.j2 b/roles/add-on/templates/flannel.yaml.j2
@@ -135,7 +135,7 @@ spec:
               fieldPath: metadata.namespace
         - name: EVENT_QUEUE_DEPTH
           value: "5000"
-        image: "{{ REGISTRY_URL | default('https://docker.io') | urlsplit('hostname') }}{% if REGISTRY_URL | default('https://docker.io') | urlsplit('port') is not none %}:{{REGISTRY_URL | default('https://docker.io') | urlsplit('port')}}{% endif %}{% if REGISTRY_URL | default('https://docker.io') | urlsplit('path') is not none %}{{ REGISTRY_URL | default('https://docker.io') | urlsplit('path') }}{% endif %}/flannel/flannel:v0.26.3"
+        image: "{{ REGISTRY_URL | default('https://ghcr.io') | urlsplit('hostname') }}{% if REGISTRY_URL | default('https://ghcr.io') | urlsplit('port') is not none %}:{{REGISTRY_URL | default('https://ghcr.io') | urlsplit('port')}}{% endif %}{% if REGISTRY_URL | default('https://ghcr.io') | urlsplit('path') is not none %}{{ REGISTRY_URL | default('https://ghcr.io') | urlsplit('path') }}{% endif %}/flannel-io/flannel:v0.26.4"
         name: kube-flannel
         resources:
           requests:
@@ -162,7 +162,7 @@ spec:
         - /opt/cni/bin/flannel
         command:
         - cp
-        image: "{{ REGISTRY_URL | default('https://docker.io') | urlsplit('hostname') }}{% if REGISTRY_URL | default('https://docker.io') | urlsplit('port') is not none %}:{{REGISTRY_URL | default('https://docker.io') | urlsplit('port')}}{% endif %}{% if REGISTRY_URL | default('https://docker.io') | urlsplit('path') is not none %}{{ REGISTRY_URL | default('https://docker.io') | urlsplit('path') }}{% endif %}/flannel/flannel-cni-plugin:v1.6.0-flannel1"
+        image: "{{ REGISTRY_URL | default('https://ghcr.io') | urlsplit('hostname') }}{% if REGISTRY_URL | default('https://ghcr.io') | urlsplit('port') is not none %}:{{REGISTRY_URL | default('https://ghcr.io') | urlsplit('port')}}{% endif %}{% if REGISTRY_URL | default('https://ghcr.io') | urlsplit('path') is not none %}{{ REGISTRY_URL | default('https://ghcr.io') | urlsplit('path') }}{% endif %}/flannel-io/flannel-cni-plugin:v1.6.2-flannel1"
         name: install-cni-plugin
         volumeMounts:
         - mountPath: /opt/cni/bin
@@ -173,7 +173,7 @@ spec:
         - /etc/cni/net.d/10-flannel.conflist
         command:
         - cp
-        image: "{{ REGISTRY_URL | default('https://docker.io') | urlsplit('hostname') }}{% if REGISTRY_URL | default('https://docker.io') | urlsplit('port') is not none %}:{{REGISTRY_URL | default('https://docker.io') | urlsplit('port')}}{% endif %}{% if REGISTRY_URL | default('https://docker.io') | urlsplit('path') is not none %}{{ REGISTRY_URL | default('https://docker.io') | urlsplit('path') }}{% endif %}/flannel/flannel:v0.26.3"
+        image: "{{ REGISTRY_URL | default('https://ghcr.io') | urlsplit('hostname') }}{% if REGISTRY_URL | default('https://ghcr.io') | urlsplit('port') is not none %}:{{REGISTRY_URL | default('https://ghcr.io') | urlsplit('port')}}{% endif %}{% if REGISTRY_URL | default('https://ghcr.io') | urlsplit('path') is not none %}{{ REGISTRY_URL | default('https://ghcr.io') | urlsplit('path') }}{% endif %}/flannel-io/flannel:v0.26.4"
         name: install-cni
         volumeMounts:
         - mountPath: /etc/cni/net.d

diff --git a/scripts/make-registry.sh b/scripts/make-registry.sh
@@ -45,13 +45,13 @@ docker push ${REGISTRY_URL}/coredns/coredns:v1.10.1
 
 
 # flannel
-docker pull docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1
-docker tag docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1 ${REGISTRY_URL}/flannel/flannel-cni-plugin:v1.6.0-flannel1
-docker push ${REGISTRY_URL}/flannel/flannel-cni-plugin:v1.6.0-flannel1
+docker pull ghcr.io/flannel-io/flannel-cni-plugin:v1.6.2-flannel1
+docker tag ghcr.io/flannel-io/flannel-cni-plugin:v1.6.2-flannel1 ${REGISTRY_URL}/flannel-io/flannel-cni-plugin:v1.6.2-flannel1
+docker push ${REGISTRY_URL}/flannel-io/flannel-cni-plugin:v1.6.2-flannel1
 
-docker pull docker.io/flannel/flannel:v0.26.3
-docker tag docker.io/flannel/flannel:v0.26.3 ${REGISTRY_URL}/flannel/flannel:v0.26.3
-docker push ${REGISTRY_URL}/flannel/flannel:v0.26.3
+docker pull ghcr.io/flannel-io/flannel:v0.26.4
+docker tag ghcr.io/flannel-io/flannel:v0.26.4 ${REGISTRY_URL}/flannel-io/flannel:v0.26.4
+docker push ${REGISTRY_URL}/flannel-io/flannel:v0.26.4
 
 
 # metrics-server