diff --git a/cluster.yml b/cluster.yml index 3ecfc55df..05c913828 100644 --- a/cluster.yml +++ b/cluster.yml @@ -46,14 +46,12 @@ roles: - { role: kubespray-defaults} - { role: etcd, tags: etcd, etcd_cluster_setup: true } - environment: "{{proxy_env}}" - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - { role: kubespray-defaults} - { role: etcd, tags: etcd, etcd_cluster_setup: false } - environment: "{{proxy_env}}" - hosts: etcd:k8s-cluster:vault any_errors_fatal: "{{ any_errors_fatal | default(true) }}" @@ -76,7 +74,6 @@ - { role: kubernetes/master, tags: master } - { role: kubernetes/client, tags: client } - { role: kubernetes-apps/cluster_roles, tags: cluster-roles } - environment: "{{proxy_env}}" - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" @@ -84,7 +81,6 @@ - { role: kubespray-defaults} - { role: kubernetes/kubeadm, tags: kubeadm, when: "kubeadm_enabled" } - { role: network_plugin, tags: network } - environment: "{{proxy_env}}" - hosts: kube-master any_errors_fatal: "{{ any_errors_fatal | default(true) }}" @@ -93,14 +89,12 @@ - { role: kubernetes-apps/rotate_tokens, tags: rotate_tokens, when: "secret_changed|default(false)" } - { role: kubernetes-apps/network_plugin, tags: network } - { role: kubernetes-apps/policy_controller, tags: policy-controller } - environment: "{{proxy_env}}" - hosts: calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - { role: kubespray-defaults} - { role: network_plugin/calico/rr, tags: network } - environment: "{{proxy_env}}" - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" @@ -115,4 +109,3 @@ roles: - { role: kubespray-defaults} - { role: kubernetes-apps, tags: apps } - environment: "{{proxy_env}}"