Merge "[OC] add opencontrail admin"
diff --git a/etcd/server/cluster.yml b/etcd/server/cluster.yml
index 459d492..d9c1c8b 100644
--- a/etcd/server/cluster.yml
+++ b/etcd/server/cluster.yml
@@ -4,10 +4,19 @@
- service.etcd.linux
parameters:
_param:
- docker_image_etcd: quay.io/coreos/etcd:v3.3.8
+ docker_image_etcd: quay.io/coreos/etcd:v3.3.10
+ kubernetes_etcd_repo: https://github.com/etcd-io/etcd/releases/download
+ kubernetes_etcd_source: ${_param:kubernetes_etcd_repo}/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz
+ kubernetes_etcd_source_hash: md5=dbbe0d021ba497bf9d9cc9963d0c7a4b
etcd:
server:
enabled: true
image: ${_param:docker_image_etcd}
+ source:
+ engine: archive
+ etcd_source: ${_param:kubernetes_etcd_source}
+ etcd_source_hash: ${_param:kubernetes_etcd_source_hash}
bind:
- host: ${_param:cluster_local_address}
\ No newline at end of file
+ host: ${_param:cluster_local_address}
+ ssl:
+ enabled: true
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index b76c1b6..d015a80 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -24,7 +24,6 @@
kubernetes_containerd_repo: https://github.com/kubernetes-sigs/cri-tools/releases/download
# component images/binaries
- kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v3.1.3
kubernetes_calico_kube_controllers_image: ${_param:kubernetes_calico_kube_ctl_repo}/kube-controllers:v3.1.3
kubernetes_calico_calicoctl_source: ${_param:kubernetes_calico_calicoctl_repo}/calicoctl-v3.1.3
@@ -68,6 +67,7 @@
kubernetes_hyperkube_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/hyperkube-amd64:v1.11.3-2
kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.1.3
kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.1.3
+ kubernetes_containerd_package: containerd.io=1.2.0-1
kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:mcp_version}
kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:mcp_version}
@@ -90,7 +90,7 @@
kubernetes_sriov_enabled: false
kubernetes_telegraf_enabled: false
kubernetes_ingressnginx_enabled: false
- kubernetes_containerd_enabled: false
+ kubernetes_containerd_enabled: true
kubernetes_ingressnginx_controller_replicas: 1
@@ -116,19 +116,12 @@
kernel:
sysctl:
net.ipv4.ip_forward: 1
- docker:
- host:
- pkgs:
- - ${_param:kubernetes_docker_package}
- - python-docker
- options:
- bip: 172.31.255.1/24
- storage-driver: overlay2
kubernetes:
common:
containerd:
enabled: ${_param:kubernetes_containerd_enabled}
+ package: ${_param:kubernetes_containerd_package}
crictl:
source: ${_param:kubernetes_containerd_source}
hash: ${_param:kubernetes_containerd_source_hash}
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index a375748..8fcc6b7 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -1,6 +1,5 @@
classes:
- service.kubernetes.pool.cluster
-- service.docker.host
- system.kubernetes.common
parameters:
kubernetes:
@@ -12,9 +11,3 @@
enabled: true
policy:
enabled: false
- docker:
- host:
- options:
- iptables: false
- log-opts:
- labels: "io.kubernetes.pod.name"
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 06178df..94b9434 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -1,14 +1,7 @@
classes:
- service.kubernetes.pool.single
-- service.docker.host
- system.kubernetes.common
parameters:
kubernetes:
pool:
enabled: true
- docker:
- host:
- options:
- iptables: false
- log-opts:
- labels: "io.kubernetes.pod.name"