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

Update Canal to the latest 

- Calico to v2.4.1
- Flannel to v0.8.0
- Update Calico RBAC
This commit is contained in:
Erik Stidham 2017-08-11 16:24:18 -05:00
parent d8dde0c2b0
commit ec68c0c00b
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.6.yaml.template
View File

@ -85,7 +85,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:v1.3.0 image: quay.io/calico/node:v2.4.1
env: env:
# Use Kubernetes API as the backing datastore. # Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE - name: DATASTORE_TYPE
@ -102,6 +102,9 @@ spec:
# Don't enable BGP. # Don't enable BGP.
- name: CALICO_NETWORKING_BACKEND - name: CALICO_NETWORKING_BACKEND
value: "none" value: "none"
# Cluster type to identify the deployment type
- name: CLUSTER_TYPE
value: "kops,canal"
# Disable file logging so `kubectl logs` works. # Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING - name: CALICO_DISABLE_FILE_LOGGING
value: "true" value: "true"
@ -132,7 +135,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:v1.9.1 image: quay.io/calico/cni:v1.10.0
command: ["/install-cni.sh"] command: ["/install-cni.sh"]
env: env:
# The CNI network config to install on each node. # The CNI network config to install on each node.
@ -153,7 +156,7 @@ spec:
# This container runs flannel using the kube-subnet-mgr backend # This container runs flannel using the kube-subnet-mgr backend
# for allocating subnets. # for allocating subnets.
- name: kube-flannel - name: kube-flannel
image: quay.io/coreos/flannel:v0.7.1 image: quay.io/coreos/flannel:v0.8.0
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ] command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
securityContext: securityContext:
privileged: true privileged: true
@ -263,9 +266,16 @@ rules:
- get - get
- list - list
- watch - watch
- apiGroups: ["projectcalico.org"]
resources:
- globalbgppeers
verbs:
- get
- list
- apiGroups: ["projectcalico.org"] - apiGroups: ["projectcalico.org"]
resources: resources:
- globalconfigs - globalconfigs
- globalbgpconfigs
verbs: verbs:
- create - create
- get - get
@ -277,11 +287,17 @@ rules:
- ippools - ippools
verbs: verbs:
- create - create
- delete
- get - get
- list - list
- update - update
- watch - watch
- apiGroups: ["alpha.projectcalico.org"]
resources:
- systemnetworkpolicies
verbs:
- get
- list
- watch
--- ---

11
upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/pre-k8s-1.6.yaml.template
View File

@ -77,7 +77,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:v1.2.1 image: quay.io/calico/node:v2.4.1
env: env:
# Use Kubernetes API as the backing datastore. # Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE - name: DATASTORE_TYPE
@ -94,6 +94,9 @@ spec:
# Don't enable BGP. # Don't enable BGP.
- name: CALICO_NETWORKING_BACKEND - name: CALICO_NETWORKING_BACKEND
value: "none" value: "none"
# Cluster type to identify the deployment type
- name: CLUSTER_TYPE
value: "kops,canal"
# Disable file logging so `kubectl logs` works. # Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING - name: CALICO_DISABLE_FILE_LOGGING
value: "true" value: "true"
@ -124,7 +127,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:v1.8.3 image: quay.io/calico/cni:v1.10.0
command: ["/install-cni.sh"] command: ["/install-cni.sh"]
env: env:
# The CNI network config to install on each node. # The CNI network config to install on each node.
@ -145,7 +148,7 @@ spec:
# This container runs flannel using the kube-subnet-mgr backend # This container runs flannel using the kube-subnet-mgr backend
# for allocating subnets. # for allocating subnets.
- name: kube-flannel - name: kube-flannel
image: quay.io/coreos/flannel:v0.7.1 image: quay.io/coreos/flannel:v0.8.0
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ] command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
securityContext: securityContext:
privileged: true privileged: true
@ -194,4 +197,4 @@ spec:
path: /run path: /run
- name: flannel-cfg - name: flannel-cfg
configMap: configMap:
name: canal-config name: canal-config

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

@ -413,8 +413,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if b.cluster.Spec.Networking.Canal != nil { if b.cluster.Spec.Networking.Canal != nil {
key := "networking.projectcalico.org.canal" key := "networking.projectcalico.org.canal"
// Locking canal addon version to 1.3 (same as Calico node). Best to maintain lockstep for sanity // Locking canal addon version to 2.4.1 (same as Calico node). Best to maintain lockstep for sanity
version := "1.3" version := "2.4.1"
{ {
location := key + "/pre-k8s-1.6.yaml" location := key + "/pre-k8s-1.6.yaml"