mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-03-07 03:31:20 -03:30
Remove non-kubeadm deployment (#3811)
* Remove non-kubeadm deployment * More cleanup * More cleanup * More cleanup * More cleanup * Fix gitlab * Try stop gce first before absent to make the delete process work * More cleanup * Fix bug with checking if kubeadm has already run * Fix bug with checking if kubeadm has already run * More fixes * Fix test * fix * Fix gitlab checkout untill kubespray 2.8 is on quay * Fixed * Add upgrade path from non-kubeadm to kubeadm. Revert ssl path * Readd secret checking * Do gitlab checks from v2.7.0 test upgrade path to 2.8.0 * fix typo * Fix CI jobs to kubeadm again. Fix broken hyperkube path * Fix gitlab * Fix rotate tokens * More fixes * More fixes * Fix tokens
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
0d1be39a97
commit
ddffdb63bf
@@ -226,14 +226,10 @@ docker_options: >-
|
||||
|
||||
# Settings for containerized control plane (etcd/kubelet/secrets)
|
||||
etcd_deployment_type: docker
|
||||
kubelet_deployment_type: docker
|
||||
cert_management: script
|
||||
|
||||
helm_deployment_type: host
|
||||
|
||||
# Enable kubeadm deployment
|
||||
kubeadm_enabled: true
|
||||
|
||||
# Make a copy of kubeconfig on the host that runs Ansible in {{ inventory_dir }}/artifacts
|
||||
kubeconfig_localhost: false
|
||||
# Download kubectl onto the host that runs Ansible in {{ bin_dir }}
|
||||
@@ -282,7 +278,7 @@ openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
|
||||
## the k8s cluster. Only 'AlwaysAllow', 'AlwaysDeny', 'Node' and
|
||||
## 'RBAC' modes are tested. Order is important.
|
||||
authorization_modes: ['Node', 'RBAC']
|
||||
rbac_enabled: "{{ 'RBAC' in authorization_modes or kubeadm_enabled }}"
|
||||
rbac_enabled: "{{ 'RBAC' in authorization_modes }}"
|
||||
|
||||
# When enabled, API bearer tokens (including service account tokens) can be used to authenticate to the kubelet’s HTTPS endpoint
|
||||
kubelet_authentication_token_webhook: true
|
||||
@@ -395,18 +391,8 @@ kube_apiserver_endpoint: |-
|
||||
{%- endif %}
|
||||
kube_apiserver_insecure_endpoint: >-
|
||||
http://{{ kube_apiserver_insecure_bind_address | regex_replace('0\.0\.0\.0','127.0.0.1') }}:{{ kube_apiserver_insecure_port }}
|
||||
kube_apiserver_client_cert: |-
|
||||
{% if kubeadm_enabled -%}
|
||||
{{ kube_cert_dir }}/ca.crt
|
||||
{%- else -%}
|
||||
{{ kube_cert_dir }}/apiserver.pem
|
||||
{%- endif %}
|
||||
kube_apiserver_client_key: |-
|
||||
{% if kubeadm_enabled -%}
|
||||
{{ kube_cert_dir }}/ca.key
|
||||
{%- else -%}
|
||||
{{ kube_cert_dir }}/apiserver-key.pem
|
||||
{%- endif %}
|
||||
kube_apiserver_client_cert: "{{ kube_cert_dir }}/ca.crt"
|
||||
kube_apiserver_client_key: "{{ kube_cert_dir }}/ca.key"
|
||||
|
||||
# Set to true to deploy etcd-events cluster
|
||||
etcd_events_cluster_enabled: false
|
||||
|
||||
Reference in New Issue
Block a user