Skip to content

Commit ff0ef98

Browse files
authored
Merge pull request kubernetes#95424 from caseydavenport/calico-v3.16.2
Update to Calico v3.16.2
2 parents 33fd555 + 39dd16d commit ff0ef98

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ spec:
2727
terminationGracePeriodSeconds: 0
2828
initContainers:
2929
- name: install-cni
30-
image: gcr.io/projectcalico-org/cni:v3.15.2
31-
command: ["/install-cni.sh"]
30+
image: gcr.io/projectcalico-org/cni:v3.16.2
31+
command: ["/opt/cni/bin/install"]
3232
env:
3333
- name: CNI_CONF_NAME
3434
value: "10-calico.conflist"
@@ -51,7 +51,7 @@ spec:
5151
"type": "k8s"
5252
},
5353
"kubernetes": {
54-
"kubeconfig": "__KUBECONFIG_FILEPATH__"
54+
"kubeconfig": "/etc/cni/net.d/calico-kubeconfig"
5555
}
5656
},
5757
{
@@ -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.15.2
81+
image: gcr.io/projectcalico-org/node:v3.16.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.15.2
26+
- image: gcr.io/projectcalico-org/typha:v3.16.2
2727
name: calico-typha
2828
ports:
2929
- containerPort: 5473

0 commit comments

Comments
 (0)