upgrade flannel v0.26.2

buxiaomo · Dec 23, 2024 · 45b95d7 · 45b95d7
1 parent 163ae18
commit 45b95d7
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.1"
+        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.2"
         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.5.1-flannel2"
+        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"
         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.1"
+        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.2"
         name: install-cni
         volumeMounts:
         - mountPath: /etc/cni/net.d

diff --git a/scripts/make-registry.sh b/scripts/make-registry.sh
@@ -44,13 +44,13 @@ docker push ${REGISTRY_URL}/coredns/coredns:1.10.1
 
 
 # flannel
-docker pull docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2
-docker tag docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2 ${REGISTRY_URL}/flannel/flannel-cni-plugin:v1.5.1-flannel2
-docker push ${REGISTRY_URL}/flannel/flannel-cni-plugin:v1.5.1-flannel2
+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 docker.io/flannel/flannel:v0.26.1
-docker tag docker.io/flannel/flannel:v0.26.1 ${REGISTRY_URL}/flannel/flannel:v0.26.1
-docker push ${REGISTRY_URL}/flannel/flannel:v0.26.1
+docker pull docker.io/flannel/flannel:v0.26.2
+docker tag docker.io/flannel/flannel:v0.26.2 ${REGISTRY_URL}/flannel/flannel:v0.26.2
+docker push ${REGISTRY_URL}/flannel/flannel:v0.26.2
 
 
 # metrics-server