mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #58482 from tmjd/update-calico-v2-6-6
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update cluster addon Calico to v2.6.6 **What this PR does / why we need it**: Updates the cluster addon Calico to the 2.6.6 release (in preparation for upgrade to v3.0). This also switches to pull the images from gcr.io. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: @caseydavenport **Release note**: Should there be a release note for this? WDYT? ```release-note NONE ```
This commit is contained in:
commit
53b0be7c9b
@ -32,7 +32,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: calico/node:v2.6.1
|
image: gcr.io/projectcalico-org/node:v2.6.6
|
||||||
env:
|
env:
|
||||||
- name: CALICO_DISABLE_FILE_LOGGING
|
- name: CALICO_DISABLE_FILE_LOGGING
|
||||||
value: "true"
|
value: "true"
|
||||||
@ -86,7 +86,7 @@ spec:
|
|||||||
# This container installs the Calico CNI binaries
|
# This container installs the Calico CNI binaries
|
||||||
# and CNI network config file on each node.
|
# and CNI network config file on each node.
|
||||||
- name: install-cni
|
- name: install-cni
|
||||||
image: calico/cni:v1.11.0
|
image: gcr.io/projectcalico-org/cni:v1.11.2
|
||||||
command: ["/install-cni.sh"]
|
command: ["/install-cni.sh"]
|
||||||
env:
|
env:
|
||||||
- name: CNI_CONF_NAME
|
- name: CNI_CONF_NAME
|
||||||
|
@ -22,7 +22,7 @@ spec:
|
|||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
serviceAccountName: calico
|
serviceAccountName: calico
|
||||||
containers:
|
containers:
|
||||||
- image: calico/typha:v0.5.1
|
- image: gcr.io/projectcalico-org/typha:v0.5.5
|
||||||
name: calico-typha
|
name: calico-typha
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 5473
|
- containerPort: 5473
|
||||||
|
Loading…
Reference in New Issue
Block a user