mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #95424 from caseydavenport/calico-v3.16.2
Update to Calico v3.16.2
This commit is contained in:
commit
ff0ef98f34
@ -27,8 +27,8 @@ spec:
|
|||||||
terminationGracePeriodSeconds: 0
|
terminationGracePeriodSeconds: 0
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: install-cni
|
- name: install-cni
|
||||||
image: gcr.io/projectcalico-org/cni:v3.15.2
|
image: gcr.io/projectcalico-org/cni:v3.16.2
|
||||||
command: ["/install-cni.sh"]
|
command: ["/opt/cni/bin/install"]
|
||||||
env:
|
env:
|
||||||
- name: CNI_CONF_NAME
|
- name: CNI_CONF_NAME
|
||||||
value: "10-calico.conflist"
|
value: "10-calico.conflist"
|
||||||
@ -51,7 +51,7 @@ spec:
|
|||||||
"type": "k8s"
|
"type": "k8s"
|
||||||
},
|
},
|
||||||
"kubernetes": {
|
"kubernetes": {
|
||||||
"kubeconfig": "__KUBECONFIG_FILEPATH__"
|
"kubeconfig": "/etc/cni/net.d/calico-kubeconfig"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -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.15.2
|
image: gcr.io/projectcalico-org/node:v3.16.2
|
||||||
env:
|
env:
|
||||||
- name: CALICO_MANAGE_CNI
|
- name: CALICO_MANAGE_CNI
|
||||||
value: "true"
|
value: "true"
|
||||||
|
@ -23,7 +23,7 @@ spec:
|
|||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
serviceAccountName: calico
|
serviceAccountName: calico
|
||||||
containers:
|
containers:
|
||||||
- image: gcr.io/projectcalico-org/typha:v3.15.2
|
- image: gcr.io/projectcalico-org/typha:v3.16.2
|
||||||
name: calico-typha
|
name: calico-typha
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 5473
|
- containerPort: 5473
|
||||||
|
Loading…
Reference in New Issue
Block a user