update calico version to version 3.4.0

This commit is contained in:
Christian Jantz 2018-12-23 14:44:31 +01:00
parent 7af77bb79c
commit b14c014ac3
2 changed files with 5 additions and 5 deletions

View File

@ -192,7 +192,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v3.3.1
image: quay.io/calico/node:v3.4.0
env:
# The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS
@ -301,7 +301,7 @@ spec:
# This container installs the Calico CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: quay.io/calico/cni:v3.3.1
image: quay.io/calico/cni:v3.4.0
command: ["/install-cni.sh"]
env:
# Name of the CNI config file to create.
@ -439,7 +439,7 @@ spec:
serviceAccountName: calico-kube-controllers
containers:
- name: calico-kube-controllers
image: quay.io/calico/kube-controllers:v3.3.1
image: quay.io/calico/kube-controllers:v3.4.0
resources:
requests:
cpu: 10m
@ -597,7 +597,7 @@ spec:
command: ['/bin/sh', '-c', '/completion-job.sh']
env:
- name: EXPECTED_NODE_IMAGE
value: quay.io/calico/node:v3.3.1
value: quay.io/calico/node:v3.4.0
# The location of the Calico etcd cluster.
- name: CALICO_ETCD_ENDPOINTS
valueFrom:

View File

@ -645,7 +645,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
"pre-k8s-1.6": "2.4.2-kops.1",
"k8s-1.6": "2.6.9-kops.1",
"k8s-1.7": "2.6.9-kops.1",
"k8s-1.7-v3": "3.3.1-kops.3",
"k8s-1.7-v3": "3.4.0-kops.3",
}
if b.cluster.Spec.Networking.Calico.MajorVersion == "v3" {