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

update calico to 2.6.7

pull/131/head
jmgao 2018-02-25 10:34:32 +08:00
parent 6d3e2025ad
commit cd9d70060f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
roles/calico/templates/calico.yaml.j2
View File

@ -1,9 +1,9 @@
# Calico Version v2.6.5 # Calico Version v2.6.7
# https://docs.projectcalico.org/v2.6/releases#v2.6.5 # https://docs.projectcalico.org/v2.6/releases#v2.6.7
# This manifest includes the following component versions: # This manifest includes the following component versions:
# calico/node:v2.6.5 # calico/node:v2.6.7
# calico/cni:v1.11.2 # calico/cni:v1.11.2
# calico/kube-controllers:v1.0.2 # calico/kube-controllers:v1.0.3
# This ConfigMap is used to configure a self-hosted Calico installation. # This ConfigMap is used to configure a self-hosted Calico installation.
kind: ConfigMap kind: ConfigMap
@ -82,8 +82,8 @@ 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:v2.6.5 #image: quay.io/calico/node:v2.6.7
image: calico/node:v2.6.5 image: calico/node:v2.6.7
env: env:
# The location of the Calico etcd cluster. # The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS - name: ETCD_ENDPOINTS
@ -259,8 +259,8 @@ spec:
serviceAccountName: calico-kube-controllers serviceAccountName: calico-kube-controllers
containers: containers:
- name: calico-kube-controllers - name: calico-kube-controllers
#image: quay.io/calico/kube-controllers:v1.0.2 #image: quay.io/calico/kube-controllers:v1.0.3
image: calico/kube-controllers:v1.0.2 image: calico/kube-controllers:v1.0.3
env: env:
# The location of the Calico etcd cluster. # The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS - name: ETCD_ENDPOINTS