github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83976 from caseydavenport/update-calico-v3.8.3

Browse Source 
Update Calico to v3.8.3
This commit is contained in:
Kubernetes Prow Robot 2019-10-17 01:47:18 -07:00 committed by GitHub
commit 59235ee723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ spec:
terminationGracePeriodSeconds: 0 terminationGracePeriodSeconds: 0
initContainers: initContainers:
- name: install-cni - name: install-cni
image: gcr.io/projectcalico-org/cni:v3.8.2 image: gcr.io/projectcalico-org/cni:v3.8.3
command: ["/install-cni.sh"] command: ["/install-cni.sh"]
env: env:
- name: CNI_CONF_NAME - name: CNI_CONF_NAME
@ -79,8 +79,10 @@ 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.2 image: gcr.io/projectcalico-org/node:v3.8.3
env: env:
- name: CALICO_MANAGE_CNI
value: "true"
- name: CALICO_DISABLE_FILE_LOGGING - name: CALICO_DISABLE_FILE_LOGGING
value: "true" value: "true"
- name: CALICO_NETWORKING_BACKEND - name: CALICO_NETWORKING_BACKEND
@ -132,6 +134,8 @@ spec:
host: localhost host: localhost
periodSeconds: 10 periodSeconds: 10
volumeMounts: volumeMounts:
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- mountPath: /lib/modules - mountPath: /lib/modules
name: lib-modules name: lib-modules
readOnly: true readOnly: true

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

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