diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template index e4499b7d76..1ba9e5e664 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template @@ -468,7 +468,7 @@ spec: spec: containers: - name: calico-kube-controllers - image: quay.io/calico/kube-controllers:v3.7.4 + image: calico/kube-controllers:v3.8.0 initContainers: - name: migrate image: calico/upgrade:v1.0.5 @@ -520,7 +520,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.7.4 + image: calico/cni:v3.8.0 command: ["/install-cni.sh"] env: # Name of the CNI config file to create. @@ -556,7 +556,7 @@ spec: # container programs network policy and routes on each # host. - name: calico-node - image: quay.io/calico/node:v3.7.4 + image: calico/node:v3.8.0 env: # Use Kubernetes API as the backing datastore. - name: DATASTORE_TYPE diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template index 1db94093eb..9c363aba93 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template @@ -20,7 +20,7 @@ data: cni_network_config: |- { "name": "k8s-pod-network", - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "plugins": [ { "type": "calico", @@ -192,7 +192,7 @@ spec: # container programs network policy and routes on each # host. - name: calico-node - image: quay.io/calico/node:v3.7.4 + image: calico/node:v3.8.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.7.4 + image: calico/cni:v3.8.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.7.4 + image: calico/kube-controllers:v3.8.0 resources: requests: cpu: 10m diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 298344adb4..e2def3201e 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -798,8 +798,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { "pre-k8s-1.6": "2.4.2-kops.1", "k8s-1.6": "2.6.9-kops.1", "k8s-1.7": "2.6.12-kops.1", - "k8s-1.7-v3": "3.7.4-kops.1", - "k8s-1.12": "3.7.4-kops.1", + "k8s-1.7-v3": "3.8.0-kops.1", + "k8s-1.12": "3.8.0-kops.1", } {