refactor: unify and simplify apiserver loadbalancer variables

Author: kajal-jotwani

roles/kubernetes/kubeadm/templates/kubeadm-client.conf.j2

@@ -7,7 +7,7 @@ discovery:
     kubeConfigPath: {{ kube_config_dir }}/cluster-info-discovery-kubeconfig.yaml
 {% else %}
   bootstrapToken:
-    apiServerEndpoint: "{{ kube_apiserver_cluster_internal_endpoint }}"
+    apiServerEndpoint: "{{ kube_apiserver_cluster_internal_endpoint | urlsplit('netloc') }}"
     token: {{ kubeadm_token }}
 {% if ca_cert_content is defined %}
     caCertHashes:

roles/kubespray_defaults/defaults/main/main.yml

@@ -652,7 +652,7 @@ kube_apiserver_endpoint: "https://{{ first_kube_control_plane_address | ansible.
 
 # Internal endpoint for cluster traffic.
 # Defaults to the global endpoint, unless we are using a localhost API load balancer.
-kube_apiserver_cluster_internal_endpoint: "{{ 'https://127.0.0.1:' ~ loadbalancer_apiserver_port if loadbalancer_apiserver_localhost else kube_apiserver_endpoint }}"
+kube_apiserver_cluster_internal_endpoint: "{{ ('https://127.0.0.1:' ~ loadbalancer_apiserver_port) if loadbalancer_apiserver_localhost else kube_apiserver_endpoint }}"
 
 kube_apiserver_client_cert: "{{ kube_cert_dir }}/ca.crt"
 kube_apiserver_client_key: "{{ kube_cert_dir }}/ca.key"

roles/validate_inventory/tasks/main.yml

@@ -6,13 +6,24 @@
 # -> nothing depending on facts or similar cluster state
 # Checks depending on current state (of the nodes or the cluster)
 # should be in roles/kubernetes/preinstall/tasks/0040-verify-settings.yml
+
+# TODO: remove variables after release 2.31
 - name: Fail if removed variables are used
   vars:
     removed_vars: []
     removed_vars_found: "{{ query('varnames', '^' + (removed_vars | join('|')) + '$') }}"
   assert:
     that: removed_vars_found | length == 0
     fail_msg: "Removed variables present: {{ removed_vars_found | join(', ') }}"
+
+    API server loadbalancer variables have been deprecated.
+    Please update your inventory to use:
+      - kube_apiserver_endpoint
+      - kube_apiserver_cluster_internal_endpoint
+
+    And optionally:
+      - loadbalancer_apiserver_localhost (true/false)
+      - loadbalancer_apiserver_port
   run_once: true
 
 - name: Stop if kube_control_plane group is empty
@@ -61,27 +72,6 @@
   when:
     - not ignore_assert_errors
 
-# TODO: remove after release 2.31
-- name: Stop if legacy apiserver LB variables are used
-  assert:
-    that:
-      - loadbalancer_apiserver is not defined
-      - apiserver_loadbalancer_domain_name is not defined
-      - kube_apiserver_global_endpoint is not defined
-      - kubeadm_config_api_fqdn is not defined
-    fail_msg: |-
-      API server loadbalancer variables have been deprecated.
-
-      Please update your inventory to use:
-        - kube_apiserver_endpoint
-        - kube_apiserver_cluster_internal_endpoint
-
-      And optionally:
-        - loadbalancer_apiserver_localhost (true/false)
-        - loadbalancer_apiserver_port
-  run_once: true
-  when: not ignore_assert_errors
-
 # This assertion will fail on the safe side: One can indeed schedule more pods
 # on a node than the CIDR-range has space for when additional pods use the host
 # network namespace. It is impossible to ascertain the number of such pods at