Skip to content

Commit 058b4d6

Browse files
authored
Merge pull request kubernetes#94241 from lmm/calico-v3.15
Update Calico to v3.15.2
2 parents ed3be9d + 7848248 commit 058b4d6

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

cluster/addons/calico-policy-controller/calico-clusterrole.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ rules:
1414
- namespaces
1515
verbs:
1616
- get
17+
# calico/node checks configmaps for cluster CIDR.
18+
- apiGroups: [""]
19+
resources:
20+
- configmaps
21+
verbs:
22+
- get
1723
- apiGroups: [""]
1824
resources:
1925
- endpoints
@@ -55,7 +61,7 @@ rules:
5561
verbs:
5662
- patch
5763
# Calico monitors various CRDs for config.
58-
# Note: Though we are not using ipam from calico, calico node still needs those permission
64+
# Note: Though we are not using ipam from calico, calico node still needs those permissions
5965
# to boot.
6066
- apiGroups: ["crd.projectcalico.org"]
6167
resources:

cluster/addons/calico-policy-controller/calico-node-daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
terminationGracePeriodSeconds: 0
2828
initContainers:
2929
- name: install-cni
30-
image: gcr.io/projectcalico-org/cni:v3.8.4
30+
image: gcr.io/projectcalico-org/cni:v3.15.2
3131
command: ["/install-cni.sh"]
3232
env:
3333
- name: CNI_CONF_NAME
@@ -78,7 +78,7 @@ spec:
7878
# container programs network policy and routes on each
7979
# host.
8080
- name: calico-node
81-
image: gcr.io/projectcalico-org/node:v3.8.4
81+
image: gcr.io/projectcalico-org/node:v3.15.2
8282
env:
8383
- name: CALICO_MANAGE_CNI
8484
value: "true"

cluster/addons/calico-policy-controller/typha-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
hostNetwork: true
2424
serviceAccountName: calico
2525
containers:
26-
- image: gcr.io/projectcalico-org/typha:v3.8.4
26+
- image: gcr.io/projectcalico-org/typha:v3.15.2
2727
name: calico-typha
2828
ports:
2929
- containerPort: 5473

0 commit comments

Comments
 (0)