From 6ebcaab2bbfdb161f6f78444d6e1b8f3bebe499e Mon Sep 17 00:00:00 2001 From: Zefool Date: Tue, 25 Dec 2018 09:03:32 +0100 Subject: [PATCH] =?UTF-8?q?controlPlaneEndpoint=20set=20up=20through=20loa?= =?UTF-8?q?d=20balancer=20should=20be=20possible=20=E2=80=A6=20(#3888)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * controlPlaneEndpoint set up through load balancer should be possible even in single master setups Enable load balancer for single-master setups Fixes an issue where single-master setups are not reachable using the usual admin.conf from outside the cluster. controlPlaneEndpoint set up through load balancer should be possible even in single master setups * add fix to other api versions * remove obsolete check completely * remove check, pass 2 * removes checks in client configuration * delete 'and' --- .../kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 | 2 +- .../kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 | 2 +- .../kubeadm/templates/kubeadm-client.conf.v1alpha3.j2 | 2 +- .../kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 index 6a40ab03e..c76d28b78 100644 --- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 +++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 @@ -3,7 +3,7 @@ kind: NodeConfiguration caCertPath: {{ kube_cert_dir }}/ca.crt token: {{ kubeadm_token }} discoveryTokenAPIServers: -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} - {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} - {{ kubeadm_discovery_address | replace("https://", "")}} diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 index b5d8365d7..8bc0a78f0 100644 --- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 +++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 @@ -8,7 +8,7 @@ discoveryToken: {{ kubeadm_token }} tlsBootstrapToken: {{ kubeadm_token }} token: {{ kubeadm_token }} discoveryTokenAPIServers: -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} - {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} - {{ kubeadm_discovery_address | replace("https://", "")}} diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2 index ff5f2c0b4..bc60b6134 100644 --- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2 +++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2 @@ -8,7 +8,7 @@ discoveryToken: {{ kubeadm_token }} tlsBootstrapToken: {{ kubeadm_token }} token: {{ kubeadm_token }} discoveryTokenAPIServers: -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} - {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} - {{ kubeadm_discovery_address | replace("https://", "")}} diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2 index 3a3c6a471..f5123204c 100644 --- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2 +++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2 @@ -2,7 +2,7 @@ apiVersion: kubeadm.k8s.io/v1beta1 kind: JoinConfiguration discovery: bootstrapToken: -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} apiServerEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} apiServerEndpoint: {{ kubeadm_discovery_address | replace("https://", "")}} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 17e891e04..5ffbb97f6 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 @@ -1,7 +1,7 @@ apiVersion: kubeadm.k8s.io/v1alpha1 kind: MasterConfiguration api: -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }} bindPort: {{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index d133bc14e..cf7331293 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 @@ -1,7 +1,7 @@ apiVersion: kubeadm.k8s.io/v1alpha2 kind: MasterConfiguration api: -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }} bindPort: {{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index 84849242b..6238dffd9 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 @@ -37,7 +37,7 @@ networking: serviceSubnet: {{ kube_service_addresses }} podSubnet: {{ kube_pods_subnet }} kubernetesVersion: {{ kube_version }} -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} controlPlaneEndpoint: {{ ip | default(ansible_default_ipv4.address) }}:{{ kube_apiserver_port }} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index ee638d554..6a346cd83 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -38,7 +38,7 @@ networking: serviceSubnet: {{ kube_service_addresses }} podSubnet: {{ kube_pods_subnet }} kubernetesVersion: {{ kube_version }} -{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} +{% if kubeadm_config_api_fqdn is defined %} controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} {% else %} controlPlaneEndpoint: {{ ip | default(ansible_default_ipv4.address) }}:{{ kube_apiserver_port }}