Skip to content

Commit ce58e6f

Browse files
committed
Upgrade flannel
1 parent 655c894 commit ce58e6f

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spec:
9898
version: 9.99.0
9999
- id: k8s-1.25
100100
manifest: networking.flannel/k8s-1.25.yaml
101-
manifestHash: a570d436240292d500900f0b57e54652f79830120a27fddc7dd20d4212eeaab4
101+
manifestHash: 2182c4d3b22f7ee71ffbf596c2c64e177f9ed37b2e3c883f0ac2603ca2f31703
102102
name: networking.flannel
103103
prune:
104104
kinds:

tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-networking.flannel-k8s-1.25_content

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ spec:
174174
value: "5000"
175175
- name: CONT_WHEN_CACHE_NOT_READY
176176
value: "false"
177-
image: ghcr.io/flannel-io/flannel:v0.27.4
177+
image: ghcr.io/flannel-io/flannel:v0.28.2
178178
name: kube-flannel
179179
resources:
180180
requests:
@@ -201,7 +201,7 @@ spec:
201201
- /opt/cni/bin/flannel
202202
command:
203203
- cp
204-
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.8.0-flannel1
204+
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.9.0-flannel1
205205
name: install-cni-plugin
206206
volumeMounts:
207207
- mountPath: /opt/cni/bin
@@ -212,7 +212,7 @@ spec:
212212
- /etc/cni/net.d/10-flannel.conflist
213213
command:
214214
- cp
215-
image: ghcr.io/flannel-io/flannel:v0.27.4
215+
image: ghcr.io/flannel-io/flannel:v0.28.2
216216
name: install-cni
217217
volumeMounts:
218218
- mountPath: /etc/cni/net.d

upup/models/cloudup/resources/addons/networking.flannel/k8s-1.25.yaml.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Pulled and modified from: https://raw.githubusercontent.com/coreos/flannel/v0.27.4/Documentation/kube-flannel.yml
1+
# Pulled and modified from: https://raw.githubusercontent.com/coreos/flannel/v0.28.2/Documentation/kube-flannel.yml
22
---
33
kind: Namespace
44
apiVersion: v1
@@ -135,7 +135,7 @@ spec:
135135
serviceAccountName: flannel
136136
initContainers:
137137
- name: install-cni-plugin
138-
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.8.0-flannel1
138+
image: ghcr.io/flannel-io/flannel-cni-plugin:v1.9.0-flannel1
139139
command:
140140
- cp
141141
args:
@@ -146,7 +146,7 @@ spec:
146146
- name: cni-plugin
147147
mountPath: /opt/cni/bin
148148
- name: install-cni
149-
image: ghcr.io/flannel-io/flannel:v0.27.4
149+
image: ghcr.io/flannel-io/flannel:v0.28.2
150150
command:
151151
- cp
152152
args:
@@ -160,7 +160,7 @@ spec:
160160
mountPath: /etc/kube-flannel/
161161
containers:
162162
- name: kube-flannel
163-
image: ghcr.io/flannel-io/flannel:v0.27.4
163+
image: ghcr.io/flannel-io/flannel:v0.28.2
164164
command:
165165
- /opt/bin/flanneld
166166
args:

0 commit comments

Comments
 (0)