Skip to content

Commit

Permalink
Update flannel and flannel-cni version
Browse files Browse the repository at this point in the history
Signed-off-by: Manuel Buil <[email protected]>
  • Loading branch information
manuelbuil committed Jul 26, 2023
1 parent 84f0f8b commit 7e238c5
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 30 deletions.
9 changes: 3 additions & 6 deletions Documentation/kube-flannel-psp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ spec:
serviceAccountName: flannel
initContainers:
- name: install-cni-plugin
image: docker.io/flannel/flannel-cni-plugin:v1.1.2
#image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2
image: docker.io/flannel/flannel-cni-plugin:v1.2.0
command:
- cp
args:
Expand All @@ -178,8 +177,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- cp
args:
Expand All @@ -193,8 +191,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- /opt/bin/flanneld
args:
Expand Down
9 changes: 3 additions & 6 deletions Documentation/kube-flannel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ spec:
serviceAccountName: flannel
initContainers:
- name: install-cni-plugin
image: docker.io/flannel/flannel-cni-plugin:v1.1.2
#image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2
image: docker.io/flannel/flannel-cni-plugin:v1.2.0
command:
- cp
args:
Expand All @@ -151,8 +150,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- cp
args:
Expand All @@ -166,8 +164,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- /opt/bin/flanneld
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ spec:
serviceAccountName: flannel
initContainers:
- name: install-cni-plugin
image: docker.io/flannel/flannel-cni-plugin:v1.1.2
#image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2
image: docker.io/flannel/flannel-cni-plugin:v1.2.0
command:
- cp
args:
Expand All @@ -178,8 +177,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- cp
args:
Expand All @@ -193,8 +191,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- /opt/bin/flanneld
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ resources:
- kube-flannel-psp.yml
images:
- name: docker.io/flannel/flannel
newTag: v0.22.0
newTag: v0.22.1
9 changes: 3 additions & 6 deletions Documentation/kustomization/kube-flannel/kube-flannel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ spec:
serviceAccountName: flannel
initContainers:
- name: install-cni-plugin
image: docker.io/flannel/flannel-cni-plugin:v1.1.2
#image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2
image: docker.io/flannel/flannel-cni-plugin:v1.2.0
command:
- cp
args:
Expand All @@ -142,8 +141,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- cp
args:
Expand All @@ -157,8 +155,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.22.0
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
image: docker.io/flannel/flannel:v0.22.1
command:
- /opt/bin/flanneld
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ resources:
- kube-flannel.yml
images:
- name: docker.io/flannel/flannel
newTag: v0.22.0
newTag: v0.22.1
4 changes: 2 additions & 2 deletions chart/kube-flannel/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
appVersion: v0.22.0
appVersion: v0.22.1
description: Install Flannel Network Plugin.
keywords:
- Flannel
name: flannel
sources:
- https://github.com/flannel-io/flannel
version: v0.22.0
version: v0.22.1
4 changes: 2 additions & 2 deletions chart/kube-flannel/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ flannel:
# kube-flannel image
image:
repository: docker.io/flannel/flannel
tag: v0.22.0
tag: v0.22.1
image_cni:
repository: docker.io/flannel/flannel-cni-plugin
tag: v1.1.2
tag: v1.2.0
# flannel command arguments
args:
- "--ip-masq"
Expand Down

0 comments on commit 7e238c5

Please sign in to comment.