kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13562 from tesspib/flannel-0.15.1 

Update Canal's Flannel to v0.15.1
This commit is contained in:
Kubernetes Prow Robot 2022-04-28 05:21:51 -07:00 committed by GitHub
parent a093f22a91 823051d28e
commit c0902e3e15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content
View File

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.22
manifest: networking.projectcalico.org.canal/k8s-1.22.yaml
manifestHash: 3ba7d989e4267b133b6d469eed4833ab790a2d9809e788b11853c86361e767d7
manifestHash: b71e423aaac74d5fdb3e3a254759150d32f523df77ad6bb0def85cc088b0ff87
name: networking.projectcalico.org.canal
selector:
role.kubernetes.io/networking: "1"

2
tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-networking.projectcalico.org.canal-k8s-1.22_content
View File

@ -4315,7 +4315,7 @@ spec:
configMapKeyRef:
key: masquerade
name: canal-config
image: quay.io/coreos/flannel:v0.14.0
image: quay.io/coreos/flannel:v0.15.1
name: kube-flannel
securityContext:
privileged: true

2
upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template
View File

@ -4443,7 +4443,7 @@ spec:
# This container runs flannel using the kube-subnet-mgr backend
# for allocating subnets.
- name: kube-flannel
image: quay.io/coreos/flannel:v0.14.0
image: quay.io/coreos/flannel:v0.15.1
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
securityContext:
privileged: true