mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #94241 from lmm/calico-v3.15
Update Calico to v3.15.2
This commit is contained in:
commit
058b4d60a3
@ -14,6 +14,12 @@ rules:
|
||||
- namespaces
|
||||
verbs:
|
||||
- get
|
||||
# calico/node checks configmaps for cluster CIDR.
|
||||
- apiGroups: [""]
|
||||
resources:
|
||||
- configmaps
|
||||
verbs:
|
||||
- get
|
||||
- apiGroups: [""]
|
||||
resources:
|
||||
- endpoints
|
||||
@ -55,7 +61,7 @@ rules:
|
||||
verbs:
|
||||
- patch
|
||||
# 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.
|
||||
- apiGroups: ["crd.projectcalico.org"]
|
||||
resources:
|
||||
|
@ -27,7 +27,7 @@ spec:
|
||||
terminationGracePeriodSeconds: 0
|
||||
initContainers:
|
||||
- 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"]
|
||||
env:
|
||||
- name: CNI_CONF_NAME
|
||||
@ -78,7 +78,7 @@ spec:
|
||||
# container programs network policy and routes on each
|
||||
# host.
|
||||
- name: calico-node
|
||||
image: gcr.io/projectcalico-org/node:v3.8.4
|
||||
image: gcr.io/projectcalico-org/node:v3.15.2
|
||||
env:
|
||||
- name: CALICO_MANAGE_CNI
|
||||
value: "true"
|
||||
|
@ -23,7 +23,7 @@ spec:
|
||||
hostNetwork: true
|
||||
serviceAccountName: calico
|
||||
containers:
|
||||
- image: gcr.io/projectcalico-org/typha:v3.8.4
|
||||
- image: gcr.io/projectcalico-org/typha:v3.15.2
|
||||
name: calico-typha
|
||||
ports:
|
||||
- containerPort: 5473
|
||||
|
Loading…
Reference in New Issue
Block a user