From 34522ebdcd2b2c3f05fbcc8ece60d47ee625769f Mon Sep 17 00:00:00 2001 From: Michael McCulloch Date: Wed, 10 Jan 2024 15:52:39 -0700 Subject: [PATCH] Happy Lint --- tasks/control-plane-setup.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/tasks/control-plane-setup.yml b/tasks/control-plane-setup.yml index 6af9af9..641256c 100644 --- a/tasks/control-plane-setup.yml +++ b/tasks/control-plane-setup.yml @@ -15,7 +15,10 @@ --config {{ kubernetes_kubeadm_kubelet_config_file_path }} {{ kubernetes_kubeadm_init_extra_opts }} register: kubeadmin_init - when: (not kubernetes_init_stat.stat.exists) and (kubernetes_ignore_preflight_errors is not defined) and (not kubernetes_cilium_values.kubeProxyReplacement) + when: > + (not kubernetes_init_stat.stat.exists) and + (kubernetes_ignore_preflight_errors is not defined) and + (not kubernetes_cilium_values.kubeProxyReplacement) - name: Initialize Kubernetes control plane with kubeadm init and ignore_preflight_errors command: > @@ -24,7 +27,10 @@ --ignore-preflight-errors={{ kubernetes_ignore_preflight_errors }} {{ kubernetes_kubeadm_init_extra_opts }} register: kubeadmin_init - when: (not kubernetes_init_stat.stat.exists) and (kubernetes_ignore_preflight_errors is defined) and (not kubernetes_cilium_values.kubeProxyReplacement) + when: > + (not kubernetes_init_stat.stat.exists) and + (kubernetes_ignore_preflight_errors is defined) and + (not kubernetes_cilium_values.kubeProxyReplacement) - name: Initialize Kubernetes control plane with kubeadm init without kube-proxy command: > @@ -33,7 +39,10 @@ --skip-phases=addon/kube-proxy {{ kubernetes_kubeadm_init_extra_opts }} register: kubeadmin_init - when: (not kubernetes_init_stat.stat.exists) and (kubernetes_ignore_preflight_errors is not defined) and (kubernetes_cilium_values.kubeProxyReplacement) + when: > + (not kubernetes_init_stat.stat.exists) and + (kubernetes_ignore_preflight_errors is not defined) and + (kubernetes_cilium_values.kubeProxyReplacement) - name: Initialize Kubernetes control plane with kubeadm init without kube-proxy and ignore_preflight_errors command: > @@ -43,7 +52,10 @@ --skip-phases=addon/kube-proxy {{ kubernetes_kubeadm_init_extra_opts }} register: kubeadmin_init - when: (not kubernetes_init_stat.stat.exists) and (kubernetes_ignore_preflight_errors is defined) and (kubernetes_cilium_values.kubeProxyReplacement) + when: > + (not kubernetes_init_stat.stat.exists) and + (kubernetes_ignore_preflight_errors is defined) and + (kubernetes_cilium_values.kubeProxyReplacement) - name: Print the init output to screen. debug: @@ -135,9 +147,9 @@ - name: Configure Cilium networking command: > - /usr/local/bin/cilium install - --version {{ kubernetes_cilium_version }} - --datapath-mode {{ kubernetes_cilium_datapath }} + /usr/local/bin/cilium install + --version {{ kubernetes_cilium_version }} + --datapath-mode {{ kubernetes_cilium_datapath }} --values /tmp/cilium_helm.yaml --set k8sServiceHost="{{ kubernetes_apiserver_advertise_address | default(ansible_default_ipv4.address, true) }}" --set k8sServicePort=6443