summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-07 17:47:28 +0000
committerGerrit Code Review <review@openstack.org>2018-11-07 17:47:28 +0000
commitb01454859f88fedb1d7d9a9011394e9acfc19324 (patch)
tree41b8ca6415fcce24e209b38b1975e84bb35ab3cd
parente381d0a036d10603ef1f794d45cddab93f8d2dcc (diff)
parent44f0053dad0767580be97bd78b817988036bfd8e (diff)
Merge "Calico v3 Uplift"
-rw-r--r--deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml43
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml14
-rw-r--r--deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml43
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml14
4 files changed, 62 insertions, 52 deletions
diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml
index 7c5914e..2119d27 100644
--- a/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml
@@ -31,7 +31,7 @@ metadata:
31 name: common-addresses 31 name: common-addresses
32 path: .kubernetes.api_service_ip 32 path: .kubernetes.api_service_ip
33 dest: 33 dest:
34 path: .values.conf.policy_controller.K8S_API 34 path: .values.conf.controllers.K8S_API
35 pattern: KUBERNETES_IP 35 pattern: KUBERNETES_IP
36 - 36 -
37 src: 37 src:
@@ -100,29 +100,34 @@ data:
100 conf: 100 conf:
101 cni_network_config: 101 cni_network_config:
102 name: k8s-pod-network 102 name: k8s-pod-network
103 cniVersion: 0.1.0 103 cniVersion: 0.3.0
104 type: calico 104 plugins:
105 etcd_endpoints: __ETCD_ENDPOINTS__ 105 - type: calico
106 etcd_ca_cert_file: /etc/calico/pki/ca 106 etcd_endpoints: __ETCD_ENDPOINTS__
107 etcd_cert_file: /etc/calico/pki/crt 107 etcd_ca_cert_file: /etc/calico/pki/ca
108 etcd_key_file: /etc/calico/pki/key 108 etcd_cert_file: /etc/calico/pki/crt
109 log_level: debug 109 etcd_key_file: /etc/calico/pki/key
110 mtu: 1500 110 log_level: debug
111 ipam: 111 ipam:
112 type: calico-ipam 112 type: calico-ipam
113 policy: 113 policy:
114 type: k8s 114 type: k8s
115 k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__ 115 kubernetes:
116 k8s_auth_token: __SERVICEACCOUNT_TOKEN__ 116 kubeconfig: __KUBECONFIG_FILEPATH__
117 - type: portmap
118 snat: true
119 capabilities:
120 portMappings: true
117 121
118 policy_controller: 122 controllers:
119 K8S_API: "https://KUBERNETES_IP:443" 123 K8S_API: "https://KUBERNETES_IP:443"
120 124
121 node: 125 node:
122 CALICO_STARTUP_LOGLEVEL: INFO 126 CALICO_STARTUP_LOGLEVEL: INFO
123 CLUSTER_TYPE: 127 CLUSTER_TYPE: "k8s,bgp"
124 - k8s 128 ETCD_CA_CERT_FILE: /etc/calico/pki/ca
125 - bgp 129 ETCD_CERT_FILE: /etc/calico/pki/crt
130 ETCD_KEY_FILE: /etc/calico/pki/key
126 IP_AUTODETECTION_METHOD: interface=ens3 131 IP_AUTODETECTION_METHOD: interface=ens3
127 WAIT_FOR_STORAGE: "true" 132 WAIT_FOR_STORAGE: "true"
128 133
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index e4cf832..8c127f7 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -27,12 +27,12 @@ data:
27 type: git 27 type: git
28 location: https://git.openstack.org/openstack/openstack-helm-infra 28 location: https://git.openstack.org/openstack/openstack-helm-infra
29 subpath: calico 29 subpath: calico
30 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 30 reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
31 calico-htk: 31 calico-htk:
32 type: git 32 type: git
33 location: https://git.openstack.org/openstack/openstack-helm-infra 33 location: https://git.openstack.org/openstack/openstack-helm-infra
34 subpath: helm-toolkit 34 subpath: helm-toolkit
35 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 35 reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
36 apiserver: 36 apiserver:
37 type: git 37 type: git
38 location: https://git.openstack.org/openstack/airship-promenade 38 location: https://git.openstack.org/openstack/airship-promenade
@@ -578,11 +578,11 @@ data:
578 etcd: quay.io/coreos/etcd:v3.2.14 578 etcd: quay.io/coreos/etcd:v3.2.14
579 etcdctl: quay.io/coreos/etcd:v3.2.14 579 etcdctl: quay.io/coreos/etcd:v3.2.14
580 calico: 580 calico:
581 cni: quay.io/calico/cni:v1.11.2 581 cni: quay.io/calico/cni:v3.2.1
582 ctl: quay.io/calico/ctl:v1.6.2 582 ctl: quay.io/calico/ctl:release-v3.2-amd64
583 kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0 583 kube_controllers: quay.io/calico/kube-controllers:v3.2.1
584 node: quay.io/calico/node:v2.6.5 584 node: quay.io/calico/node:v3.2.1
585 settings: quay.io/calico/ctl:v1.6.2 585 settings: quay.io/calico/ctl:release-v3.2-amd64
586 osh: 586 osh:
587 memcached: 587 memcached:
588 dep_check: *dep_check 588 dep_check: *dep_check
diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml
index 8d5a8e8..b96ad18 100644
--- a/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml
@@ -31,7 +31,7 @@ metadata:
31 name: common-addresses 31 name: common-addresses
32 path: .kubernetes.api_service_ip 32 path: .kubernetes.api_service_ip
33 dest: 33 dest:
34 path: .values.conf.policy_controller.K8S_API 34 path: .values.conf.controllers.K8S_API
35 pattern: KUBERNETES_IP 35 pattern: KUBERNETES_IP
36 - 36 -
37 src: 37 src:
@@ -100,29 +100,34 @@ data:
100 conf: 100 conf:
101 cni_network_config: 101 cni_network_config:
102 name: k8s-pod-network 102 name: k8s-pod-network
103 cniVersion: 0.1.0 103 cniVersion: 0.3.0
104 type: calico 104 plugins:
105 etcd_endpoints: __ETCD_ENDPOINTS__ 105 - type: calico
106 etcd_ca_cert_file: /etc/calico/pki/ca 106 etcd_endpoints: __ETCD_ENDPOINTS__
107 etcd_cert_file: /etc/calico/pki/crt 107 etcd_ca_cert_file: /etc/calico/pki/ca
108 etcd_key_file: /etc/calico/pki/key 108 etcd_cert_file: /etc/calico/pki/crt
109 log_level: debug 109 etcd_key_file: /etc/calico/pki/key
110 mtu: 1500 110 log_level: debug
111 ipam: 111 ipam:
112 type: calico-ipam 112 type: calico-ipam
113 policy: 113 policy:
114 type: k8s 114 type: k8s
115 k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__ 115 kubernetes:
116 k8s_auth_token: __SERVICEACCOUNT_TOKEN__ 116 kubeconfig: __KUBECONFIG_FILEPATH__
117 - type: portmap
118 snat: true
119 capabilities:
120 portMappings: true
117 121
118 policy_controller: 122 controllers:
119 K8S_API: "https://KUBERNETES_IP:443" 123 K8S_API: "https://KUBERNETES_IP:443"
120 124
121 node: 125 node:
122 CALICO_STARTUP_LOGLEVEL: INFO 126 CALICO_STARTUP_LOGLEVEL: INFO
123 CLUSTER_TYPE: 127 CLUSTER_TYPE: "k8s,bgp"
124 - k8s 128 ETCD_CA_CERT_FILE: /etc/calico/pki/ca
125 - bgp 129 ETCD_CERT_FILE: /etc/calico/pki/crt
130 ETCD_KEY_FILE: /etc/calico/pki/key
126 IP_AUTODETECTION_METHOD: interface=ens3 131 IP_AUTODETECTION_METHOD: interface=ens3
127 WAIT_FOR_STORAGE: "true" 132 WAIT_FOR_STORAGE: "true"
128 133
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index a5a810e..9364afe 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -27,12 +27,12 @@ data:
27 type: git 27 type: git
28 location: https://git.openstack.org/openstack/openstack-helm-infra 28 location: https://git.openstack.org/openstack/openstack-helm-infra
29 subpath: calico 29 subpath: calico
30 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 30 reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
31 calico-htk: 31 calico-htk:
32 type: git 32 type: git
33 location: https://git.openstack.org/openstack/openstack-helm-infra 33 location: https://git.openstack.org/openstack/openstack-helm-infra
34 subpath: helm-toolkit 34 subpath: helm-toolkit
35 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 35 reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
36 apiserver: 36 apiserver:
37 type: git 37 type: git
38 location: https://git.openstack.org/openstack/airship-promenade 38 location: https://git.openstack.org/openstack/airship-promenade
@@ -431,11 +431,11 @@ data:
431 etcd: quay.io/coreos/etcd:v3.2.14 431 etcd: quay.io/coreos/etcd:v3.2.14
432 etcdctl: quay.io/coreos/etcd:v3.2.14 432 etcdctl: quay.io/coreos/etcd:v3.2.14
433 calico: 433 calico:
434 cni: quay.io/calico/cni:v1.11.2 434 cni: quay.io/calico/cni:v3.2.1
435 ctl: quay.io/calico/ctl:v1.6.2 435 ctl: quay.io/calico/ctl:release-v3.2-amd64
436 kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0 436 kube_controllers: quay.io/calico/kube-controllers:v3.2.1
437 node: quay.io/calico/node:v2.6.5 437 node: quay.io/calico/node:v3.2.1
438 settings: quay.io/calico/ctl:v1.6.2 438 settings: quay.io/calico/ctl:release-v3.2-amd64
439 packages: 439 packages:
440 named: 440 named:
441 docker: docker.io 441 docker: docker.io