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

Merge pull request #7257 from tmjd/update-calico-v3-8 

Update Calico to v3.8.0
This commit is contained in:
Kubernetes Prow Robot 2019-07-24 03:18:15 -07:00 committed by GitHub
parent ed4254c3c6 0b004a3f0c
commit f21ec59686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 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:
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

8
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template
View File

@ -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

4
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -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",
}
{