External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-20 15:27:56 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add kubeadm option to etcd_deployment_type to replace the etcd_kubeadm_enabled variable (#8317)

Browse Source 
* Add kubeadm option to etcd_deployment_type to replace the etcd_kubeadm_enabled variable

Signed-off-by: necatican <necaticanyildirim@gmail.com>

* Add etcd kubeadm deployment documentation

Signed-off-by: necatican <necaticanyildirim@gmail.com>

* Refactor warning for the deprecated 'etcd_kubeadm_enabled' variable

Signed-off-by: necatican <necaticanyildirim@gmail.com>
This commit is contained in:
Necatican Yıldırım
2022-02-22 19:53:16 +03:00
committed by GitHub
parent b9a27c91da
commit e9c8913248
24 changed files with 99 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/kubernetes/control-plane/defaults/main/main.yml
View File

@@ -2,9 +2,6 @@
# disable upgrade cluster
upgrade_cluster_setup: false
# Experimental kubeadm etcd deployment mode. Available only for new deployment
etcd_kubeadm_enabled: false
# change to 0.0.0.0 to enable insecure access from anywhere (not recommended)
kube_apiserver_insecure_bind_address: 127.0.0.1

2
roles/kubernetes/control-plane/tasks/kubeadm-etcd.yml
View File

@@ -15,4 +15,4 @@
- name: Ensure etcdctl script is installed
import_role:
name: etcdctl
when: etcd_kubeadm_enabled
when: etcd_deployment_type == "kubeadm"

2
roles/kubernetes/control-plane/tasks/kubeadm-fix-apiserver.yml
View File

@@ -21,4 +21,4 @@
dest: "{{ kube_config_dir }}/manifests/kube-apiserver.yaml"
regexp: '^ - --etcd-servers='
line: ' - --etcd-servers={{ etcd_access_addresses }}'
when: not etcd_kubeadm_enabled | default(false)
when: etcd_deployment_type != "kubeadm"

4
roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml
View File

@@ -18,7 +18,7 @@
--config={{ kube_config_dir }}/kubeadm-config.yaml
--ignore-preflight-errors=all
--allow-experimental-upgrades
--etcd-upgrade={{ etcd_kubeadm_enabled | bool | lower }}
--etcd-upgrade={{ etcd_deployment_type == "kubeadm" | bool | lower }}
--force
register: kubeadm_upgrade
# Retry is because upload config sometimes fails
@@ -39,7 +39,7 @@
--config={{ kube_config_dir }}/kubeadm-config.yaml
--ignore-preflight-errors=all
--allow-experimental-upgrades
--etcd-upgrade={{ etcd_kubeadm_enabled | bool | lower }}
--etcd-upgrade={{ etcd_deployment_type == "kubeadm" | bool | lower }}
--force
register: kubeadm_upgrade
when: inventory_hostname != first_kube_control_plane

2
roles/kubernetes/control-plane/tasks/main.yml
View File

@@ -69,7 +69,7 @@
- name: Include kubeadm etcd extra tasks
include_tasks: kubeadm-etcd.yml
when: etcd_kubeadm_enabled
when: etcd_deployment_type == "kubeadm"
- name: Include kubeadm secondary server apiserver fixes
include_tasks: kubeadm-fix-apiserver.yml

4
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
View File

@@ -33,7 +33,7 @@ apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration
clusterName: {{ cluster_name }}
etcd:
{% if not etcd_kubeadm_enabled %}
{% if etcd_deployment_type != "kubeadm" %}
external:
endpoints:
{% for endpoint in etcd_access_addresses.split(',') %}
@@ -42,7 +42,7 @@ etcd:
caFile: {{ etcd_cert_dir }}/{{ kube_etcd_cacert_file }}
certFile: {{ etcd_cert_dir }}/{{ kube_etcd_cert_file }}
keyFile: {{ etcd_cert_dir }}/{{ kube_etcd_key_file }}
{% elif etcd_kubeadm_enabled %}
{% elif etcd_deployment_type == "kubeadm" %}
local:
imageRepository: "{{ etcd_image_repo | regex_replace("/etcd$","") }}"
imageTag: "{{ etcd_image_tag }}"