github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84163 from david-tigera/update-calico-v3.8.4

Browse Source 
Update Calico to v3.8.4
This commit is contained in:
Kubernetes Prow Robot 2020-01-09 11:32:34 -08:00 committed by GitHub
commit daaa0b9c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/calico-policy-controller/calico-node-daemonset.yaml
View File

@ -27,7 +27,7 @@ spec:
terminationGracePeriodSeconds: 0 terminationGracePeriodSeconds: 0
initContainers: initContainers:
- name: install-cni - name: install-cni
image: gcr.io/projectcalico-org/cni:v3.8.3 image: gcr.io/projectcalico-org/cni:v3.8.4
command: ["/install-cni.sh"] command: ["/install-cni.sh"]
env: env:
- name: CNI_CONF_NAME - name: CNI_CONF_NAME
@ -78,7 +78,7 @@ spec:
# container programs network policy and routes on each # container programs network policy and routes on each
# host. # host.
- name: calico-node - name: calico-node
image: gcr.io/projectcalico-org/node:v3.8.3 image: gcr.io/projectcalico-org/node:v3.8.4
env: env:
- name: CALICO_MANAGE_CNI - name: CALICO_MANAGE_CNI
value: "true" value: "true"

2
cluster/addons/calico-policy-controller/typha-deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
hostNetwork: true hostNetwork: true
serviceAccountName: calico serviceAccountName: calico
containers: containers:
- image: gcr.io/projectcalico-org/typha:v3.8.3 - image: gcr.io/projectcalico-org/typha:v3.8.4
name: calico-typha name: calico-typha
ports: ports:
- containerPort: 5473 - containerPort: 5473