Calico v3 Uplift

- Updates versions and calico files to move to Calico v3.2.
- Based on [0].

[0] https://review.openstack.org/#/c/606872

Change-Id: If0a901d2e6ef12f401651297906c9a2f126d36e5
This commit is contained in:
Aaron Sheffield 2018-10-08 13:07:28 -05:00
parent af17b1d32c
commit 44f0053dad
4 changed files with 62 additions and 52 deletions

View File

@ -31,7 +31,7 @@ metadata:
name: common-addresses
path: .kubernetes.api_service_ip
dest:
path: .values.conf.policy_controller.K8S_API
path: .values.conf.controllers.K8S_API
pattern: KUBERNETES_IP
-
src:
@ -100,29 +100,34 @@ data:
conf:
cni_network_config:
name: k8s-pod-network
cniVersion: 0.1.0
type: calico
etcd_endpoints: __ETCD_ENDPOINTS__
etcd_ca_cert_file: /etc/calico/pki/ca
etcd_cert_file: /etc/calico/pki/crt
etcd_key_file: /etc/calico/pki/key
log_level: debug
mtu: 1500
ipam:
type: calico-ipam
policy:
type: k8s
k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__
k8s_auth_token: __SERVICEACCOUNT_TOKEN__
cniVersion: 0.3.0
plugins:
- type: calico
etcd_endpoints: __ETCD_ENDPOINTS__
etcd_ca_cert_file: /etc/calico/pki/ca
etcd_cert_file: /etc/calico/pki/crt
etcd_key_file: /etc/calico/pki/key
log_level: debug
ipam:
type: calico-ipam
policy:
type: k8s
kubernetes:
kubeconfig: __KUBECONFIG_FILEPATH__
- type: portmap
snat: true
capabilities:
portMappings: true
policy_controller:
controllers:
K8S_API: "https://KUBERNETES_IP:443"
node:
CALICO_STARTUP_LOGLEVEL: INFO
CLUSTER_TYPE:
- k8s
- bgp
CLUSTER_TYPE: "k8s,bgp"
ETCD_CA_CERT_FILE: /etc/calico/pki/ca
ETCD_CERT_FILE: /etc/calico/pki/crt
ETCD_KEY_FILE: /etc/calico/pki/key
IP_AUTODETECTION_METHOD: interface=ens3
WAIT_FOR_STORAGE: "true"

View File

@ -27,12 +27,12 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: calico
reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
calico-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
apiserver:
type: git
location: https://git.openstack.org/openstack/airship-promenade
@ -583,11 +583,11 @@ data:
etcd: quay.io/coreos/etcd:v3.2.14
etcdctl: quay.io/coreos/etcd:v3.2.14
calico:
cni: quay.io/calico/cni:v1.11.2
ctl: quay.io/calico/ctl:v1.6.2
kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0
node: quay.io/calico/node:v2.6.5
settings: quay.io/calico/ctl:v1.6.2
cni: quay.io/calico/cni:v3.2.1
ctl: quay.io/calico/ctl:release-v3.2-amd64
kube_controllers: quay.io/calico/kube-controllers:v3.2.1
node: quay.io/calico/node:v3.2.1
settings: quay.io/calico/ctl:release-v3.2-amd64
osh:
memcached:
dep_check: *dep_check

View File

@ -31,7 +31,7 @@ metadata:
name: common-addresses
path: .kubernetes.api_service_ip
dest:
path: .values.conf.policy_controller.K8S_API
path: .values.conf.controllers.K8S_API
pattern: KUBERNETES_IP
-
src:
@ -100,29 +100,34 @@ data:
conf:
cni_network_config:
name: k8s-pod-network
cniVersion: 0.1.0
type: calico
etcd_endpoints: __ETCD_ENDPOINTS__
etcd_ca_cert_file: /etc/calico/pki/ca
etcd_cert_file: /etc/calico/pki/crt
etcd_key_file: /etc/calico/pki/key
log_level: debug
mtu: 1500
ipam:
type: calico-ipam
policy:
type: k8s
k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__
k8s_auth_token: __SERVICEACCOUNT_TOKEN__
cniVersion: 0.3.0
plugins:
- type: calico
etcd_endpoints: __ETCD_ENDPOINTS__
etcd_ca_cert_file: /etc/calico/pki/ca
etcd_cert_file: /etc/calico/pki/crt
etcd_key_file: /etc/calico/pki/key
log_level: debug
ipam:
type: calico-ipam
policy:
type: k8s
kubernetes:
kubeconfig: __KUBECONFIG_FILEPATH__
- type: portmap
snat: true
capabilities:
portMappings: true
policy_controller:
controllers:
K8S_API: "https://KUBERNETES_IP:443"
node:
CALICO_STARTUP_LOGLEVEL: INFO
CLUSTER_TYPE:
- k8s
- bgp
CLUSTER_TYPE: "k8s,bgp"
ETCD_CA_CERT_FILE: /etc/calico/pki/ca
ETCD_CERT_FILE: /etc/calico/pki/crt
ETCD_KEY_FILE: /etc/calico/pki/key
IP_AUTODETECTION_METHOD: interface=ens3
WAIT_FOR_STORAGE: "true"

View File

@ -27,12 +27,12 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: calico
reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
calico-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
apiserver:
type: git
location: https://git.openstack.org/openstack/airship-promenade
@ -431,11 +431,11 @@ data:
etcd: quay.io/coreos/etcd:v3.2.14
etcdctl: quay.io/coreos/etcd:v3.2.14
calico:
cni: quay.io/calico/cni:v1.11.2
ctl: quay.io/calico/ctl:v1.6.2
kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0
node: quay.io/calico/node:v2.6.5
settings: quay.io/calico/ctl:v1.6.2
cni: quay.io/calico/cni:v3.2.1
ctl: quay.io/calico/ctl:release-v3.2-amd64
kube_controllers: quay.io/calico/kube-controllers:v3.2.1
node: quay.io/calico/node:v3.2.1
settings: quay.io/calico/ctl:release-v3.2-amd64
packages:
named:
docker: docker.io