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

Merge pull request #94241 from lmm/calico-v3.15

Browse Source 
Update Calico to v3.15.2
This commit is contained in:
Kubernetes Prow Robot 2020-09-09 17:59:44 -07:00 committed by GitHub
commit 058b4d60a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,12 @@ rules:
- namespaces - namespaces
verbs: verbs:
- get - get
# calico/node checks configmaps for cluster CIDR.
- apiGroups: [""]
resources:
- configmaps
verbs:
- get
- apiGroups: [""] - apiGroups: [""]
resources: resources:
- endpoints - endpoints
@ -55,7 +61,7 @@ rules:
verbs: verbs:
- patch - patch
# Calico monitors various CRDs for config. # Calico monitors various CRDs for config.
# Note: Though we are not using ipam from calico, calico node still needs those permission # Note: Though we are not using ipam from calico, calico node still needs those permissions
# to boot. # to boot.
- apiGroups: ["crd.projectcalico.org"] - apiGroups: ["crd.projectcalico.org"]
resources: resources:

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.4 image: gcr.io/projectcalico-org/cni:v3.15.2
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.4 image: gcr.io/projectcalico-org/node:v3.15.2
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.4 - image: gcr.io/projectcalico-org/typha:v3.15.2
name: calico-typha name: calico-typha
ports: ports:
- containerPort: 5473 - containerPort: 5473