Skip to content

Commit

Permalink
Merge pull request #1746 from rbrtbnfgl/version0.21.4
Browse files Browse the repository at this point in the history
Update to v0.21.4
  • Loading branch information
rbrtbnfgl authored Mar 22, 2023
2 parents f057792 + 54231ba commit a9e0609
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions Documentation/kube-flannel-psp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
command:
- cp
args:
Expand All @@ -193,8 +193,8 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
command:
- /opt/bin/flanneld
args:
Expand Down
8 changes: 4 additions & 4 deletions Documentation/kube-flannel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
command:
- cp
args:
Expand All @@ -157,8 +157,8 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
command:
- /opt/bin/flanneld
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
command:
- cp
args:
Expand All @@ -193,8 +193,8 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
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.21.3
newTag: v0.21.4
8 changes: 4 additions & 4 deletions Documentation/kustomization/kube-flannel/kube-flannel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
command:
- cp
args:
Expand All @@ -157,8 +157,8 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: docker.io/flannel/flannel:v0.21.3
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.3
image: docker.io/flannel/flannel:v0.21.4
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.21.4
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.21.3
newTag: v0.21.4
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.21.3
appVersion: v0.21.4
description: Install Flannel Network Plugin.
keywords:
- Flannel
name: flannel
sources:
- https://github.com/flannel-io/flannel
version: v0.21.3
version: v0.21.4
2 changes: 1 addition & 1 deletion chart/kube-flannel/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ flannel:
# kube-flannel image
image:
repository: docker.io/flannel/flannel
tag: v0.21.3
tag: v0.21.4
image_cni:
repository: docker.io/flannel/flannel-cni-plugin
tag: v1.1.2
Expand Down

0 comments on commit a9e0609

Please sign in to comment.