kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7249 from michalschott/master 

Bumping calico to 3.7.4.
This commit is contained in:
Kubernetes Prow Robot 2019-07-19 03:41:12 -07:00 committed by GitHub
parent 5340fc2799 d96072f7dd
commit e187adb0e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template
View File

@ -468,7 +468,7 @@ spec:
spec: spec:
containers: containers:
- name: calico-kube-controllers - name: calico-kube-controllers
image: quay.io/calico/kube-controllers:v3.7.2 image: quay.io/calico/kube-controllers:v3.7.4
initContainers: initContainers:
- name: migrate - name: migrate
image: calico/upgrade:v1.0.5 image: calico/upgrade:v1.0.5
@ -520,7 +520,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: quay.io/calico/cni:v3.7.2 image: quay.io/calico/cni:v3.7.4
command: ["/install-cni.sh"] command: ["/install-cni.sh"]
env: env:
# Name of the CNI config file to create. # Name of the CNI config file to create.
@ -556,7 +556,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: quay.io/calico/node:v3.7.2 image: quay.io/calico/node:v3.7.4
env: env:
# Use Kubernetes API as the backing datastore. # Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE - name: DATASTORE_TYPE