diff --git a/ansible/k8s/templates/custom-config.yaml.j2 b/ansible/k8s/templates/custom-config.yaml.j2 deleted file mode 100644 index 70aae17094be372c7272dabb2638bfc1c3ae65a4..0000000000000000000000000000000000000000 --- a/ansible/k8s/templates/custom-config.yaml.j2 +++ /dev/null @@ -1,48 +0,0 @@ -{% if active_server is defined %} -server: https://{{ rke2_api_ip }}:9345 -{% endif %} -token: {{ rke2_token }} -data-dir: {{ rke2_data_path }} -{% if inventory_hostname in groups[rke2_servers_group_name] %} -cni: {{ rke2_cni }} -disable-kube-proxy: {{ rke2_disable_kube_proxy }} -tls-san: - - cluster.local - - {{ rke2_api_ip }} -{% for san in rke2_additional_sans %} - - {{ san }} -{% endfor %} -{% endif %} -{% if ( combined_node_taints is defined and combined_node_taints|length > 0) %} -node-taint: -{% for taint in combined_node_taints %} - - {{ taint }} -{% endfor %} -{% endif %} -{% if rke2_disable and ( inventory_hostname|string() in groups[rke2_servers_group_name] ) %} -disable: {{ rke2_disable }} -{% endif %} -{% if rke2_kube_apiserver_args is defined and inventory_hostname in groups[rke2_servers_group_name] %} -kube-apiserver-arg: {{ rke2_kube_apiserver_args}} -{% endif %} -{% if ( k8s_node_label is defined ) %} -node-label: -{% for label in k8s_node_label %} - - {{ label }} -{% endfor %} -{% endif %} -snapshotter: {{ rke2_snapshooter }} -node-name: {{ inventory_hostname }} -{% if 'cis' in rke2_cis_profile %} -profile: {{ rke2_cis_profile }} -{%endif%} -{% if rke2_server_options is defined and inventory_hostname in groups[rke2_servers_group_name] %} -{% for option in rke2_server_options %} -{{ option }} -{% endfor %} -{% endif %} -{% if rke2_agent_options is defined and inventory_hostname in groups[rke2_agents_group_name] %} -{% for option in rke2_agent_options %} -{{ option }} -{% endfor %} -{% endif %} \ No newline at end of file diff --git a/ansible/k8s/vars/main.yaml b/ansible/k8s/vars/main.yaml index 7b372a309fa6ecffd68ebb116c8be992c0b1b7f4..4e5a921eb41b03849cdfbddb196622a452ea6fa3 100644 --- a/ansible/k8s/vars/main.yaml +++ b/ansible/k8s/vars/main.yaml @@ -155,7 +155,6 @@ rke2_snapshooter: overlayfs # Deploy RKE2 with default CNI canal rke2_cni: cilium -rke2_disable_kube_proxy: true # Validate system configuration against the selected benchmark # (Supported value is "cis-1.23" or eventually "cis-1.6" if you are running RKE2 prior 1.25)