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.
pull/5609/head
Fabiano Tessarolo 2020-02-07 07:17:43 -03:00 committed by GitHub
parent 422b25ab1f
commit 16fd2e5d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions

View File

@ -19,9 +19,14 @@ skip_downloads: false
## k8s-cluster.yml ## k8s-cluster.yml
```yaml ```yaml
etcd_deployment_type: host
kubelet_deployment_type: host kubelet_deployment_type: host
container_manager: crio container_manager: crio
``` ```
## etcd.yml
```yaml
etcd_deployment_type: host
```
[CRI-O]: https://cri-o.io/ [CRI-O]: https://cri-o.io/

View File

@ -1,3 +1,4 @@
---
## Etcd auto compaction retention for mvcc key value store in hour ## Etcd auto compaction retention for mvcc key value store in hour
# etcd_compaction_retention: 0 # etcd_compaction_retention: 0
@ -16,3 +17,6 @@
### ETCD: disable peer client cert authentication. ### ETCD: disable peer client cert authentication.
# This affects ETCD_PEER_CLIENT_CERT_AUTH variable # This affects ETCD_PEER_CLIENT_CERT_AUTH variable
# etcd_peer_client_auth: true # etcd_peer_client_auth: true
## Settings for etcd deployment type
etcd_deployment_type: docker

View File

@ -158,8 +158,7 @@ dns_domain: "{{ cluster_name }}"
## docker for docker, crio for cri-o and containerd for containerd. ## docker for docker, crio for cri-o and containerd for containerd.
container_manager: docker container_manager: docker
## Settings for containerized control plane (etcd/kubelet/secrets) ## Settings for containerized control plane (kubelet/secrets)
etcd_deployment_type: docker
kubelet_deployment_type: host kubelet_deployment_type: host
helm_deployment_type: host helm_deployment_type: host