From 16fd2e5d687d0e57dc2beca595002bee9ca35458 Mon Sep 17 00:00:00 2001 From: Fabiano Tessarolo Date: Fri, 7 Feb 2020 07:17:43 -0300 Subject: [PATCH] Fix etcd deployment type variable location (#5587) On deployments types where etcd server is splitted from Kube Master, the deployment fails since it cannot find the variable. --- docs/cri-o.md | 7 ++++++- inventory/sample/group_vars/etcd.yml | 4 ++++ inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/cri-o.md b/docs/cri-o.md index 587b64674..b9ffb2a46 100644 --- a/docs/cri-o.md +++ b/docs/cri-o.md @@ -19,9 +19,14 @@ skip_downloads: false ## k8s-cluster.yml ```yaml -etcd_deployment_type: host kubelet_deployment_type: host container_manager: crio ``` +## etcd.yml + +```yaml +etcd_deployment_type: host +``` + [CRI-O]: https://cri-o.io/ diff --git a/inventory/sample/group_vars/etcd.yml b/inventory/sample/group_vars/etcd.yml index d2335c66e..737482f7e 100644 --- a/inventory/sample/group_vars/etcd.yml +++ b/inventory/sample/group_vars/etcd.yml @@ -1,3 +1,4 @@ +--- ## Etcd auto compaction retention for mvcc key value store in hour # etcd_compaction_retention: 0 @@ -16,3 +17,6 @@ ### ETCD: disable peer client cert authentication. # This affects ETCD_PEER_CLIENT_CERT_AUTH variable # etcd_peer_client_auth: true + +## Settings for etcd deployment type +etcd_deployment_type: docker \ No newline at end of file diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml index d441c30e3..1bb6bfc30 100644 --- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml @@ -158,8 +158,7 @@ dns_domain: "{{ cluster_name }}" ## docker for docker, crio for cri-o and containerd for containerd. container_manager: docker -## Settings for containerized control plane (etcd/kubelet/secrets) -etcd_deployment_type: docker +## Settings for containerized control plane (kubelet/secrets) kubelet_deployment_type: host helm_deployment_type: host