fix: set cilium api server endpoint for high availability clusters

Author: r3m8

roles/network_plugin/cilium/templates/values.yaml.j2

@@ -7,9 +7,9 @@ image:
   repository: {{ cilium_image_repo }}
   tag: {{ cilium_image_tag }}
 
-k8sServiceHost: "{% if cilium_config_extra_vars is defined and 'k8s-service-host' in cilium_config_extra_vars %}{{ cilium_config_extra_vars['k8s-service-host'] }}{% elif loadbalancer_apiserver is defined and apiserver_loadbalancer_domain_name is defined %}{{ apiserver_loadbalancer_domain_name }}{% elif loadbalancer_apiserver is defined and loadbalancer_apiserver.address is defined %}{{ loadbalancer_apiserver.address }}{% elif loadbalancer_apiserver_localhost is defined and loadbalancer_apiserver_localhost == true %}127.0.0.1{% else %}{{ first_kube_control_plane_address }}{% endif %}"
+k8sServiceHost: "{{ cilium_k8s_service_host }}"
 
-k8sServicePort: "{% if cilium_config_extra_vars is defined and 'k8s-service-port' in cilium_config_extra_vars %}{{ cilium_config_extra_vars['k8s-service-port'] }}{% elif loadbalancer_apiserver is defined and loadbalancer_apiserver.port is defined %}{{ loadbalancer_apiserver.port }}{% elif loadbalancer_apiserver_localhost is defined and loadbalancer_apiserver_localhost == true and loadbalancer_apiserver_port is defined %}{{ loadbalancer_apiserver_port }}{% else %}{{ kube_apiserver_port }}{% endif %}"
+k8sServicePort: "{{ cilium_k8s_service_port }}"
 
 ipv4:
   enabled: {{ cilium_enable_ipv4 | to_json }}

roles/network_plugin/cilium/vars/main.yml

@@ -0,0 +1,27 @@
+cilium_k8s_service_host: >-
+  {% if cilium_config_extra_vars is defined and 'k8s-service-host' in cilium_config_extra_vars %}
+    {{ cilium_config_extra_vars['k8s-service-host'] }}
+  {% elif cilium_config_extra_vars is defined and 'k8sServiceHost' in cilium_config_extra_vars %}
+    {{ cilium_config_extra_vars['k8sServiceHost'] }}
+  {% elif loadbalancer_apiserver is defined and apiserver_loadbalancer_domain_name is defined %}
+    {{ apiserver_loadbalancer_domain_name }}
+  {% elif loadbalancer_apiserver is defined and loadbalancer_apiserver.address is defined %}
+    {{ loadbalancer_apiserver.address }}
+  {% elif loadbalancer_apiserver_localhost is defined and loadbalancer_apiserver_localhost == true %}
+    127.0.0.1
+  {% else %}
+    {{ first_kube_control_plane_address }}
+  {% endif %}
+
+cilium_k8s_service_port: >-
+  {% if cilium_config_extra_vars is defined and 'k8s-service-port' in cilium_config_extra_vars %}
+    {{ cilium_config_extra_vars['k8s-service-port'] }}
+  {% elif cilium_config_extra_vars is defined and 'k8sServicePort' in cilium_config_extra_vars %}
+    {{ cilium_config_extra_vars['k8sServicePort'] }}
+  {% elif loadbalancer_apiserver is defined and loadbalancer_apiserver.port is defined %}
+    {{ loadbalancer_apiserver.port }}
+  {% elif loadbalancer_apiserver_localhost is defined and loadbalancer_apiserver_localhost == true and loadbalancer_apiserver_port is defined %}
+    {{ loadbalancer_apiserver_port }}
+  {% else %}
+    {{ kube_apiserver_port }}
+  {% endif %}