Browse Source

Fix kubeadm lb

pull/3193/head
rongzhang 6 years ago
parent
commit
9eade647e6
2 changed files with 8 additions and 6 deletions
  1. 7
      roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
  2. 7
      roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2

7
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2

@ -1,10 +1,11 @@
apiVersion: kubeadm.k8s.io/v1alpha1 apiVersion: kubeadm.k8s.io/v1alpha1
kind: MasterConfiguration kind: MasterConfiguration
api: api:
advertiseAddress: {{ ip | default(ansible_default_ipv4.address) }}
bindPort: {{ kube_apiserver_port }}
{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} {% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}
controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ kube_apiserver_port }}
{% else %}
advertiseAddress: {{ ip | default(ansible_default_ipv4.address) }}
bindPort: {{ kube_apiserver_port }}
{% endif %} {% endif %}
etcd: etcd:
endpoints: endpoints:

7
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2

@ -1,10 +1,11 @@
apiVersion: kubeadm.k8s.io/v1alpha2 apiVersion: kubeadm.k8s.io/v1alpha2
kind: MasterConfiguration kind: MasterConfiguration
api: api:
advertiseAddress: {{ ip | default(ansible_default_ipv4.address) }}
bindPort: {{ kube_apiserver_port }}
{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %} {% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}
controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ kube_apiserver_port }}
{% else %}
advertiseAddress: {{ ip | default(ansible_default_ipv4.address) }}
bindPort: {{ kube_apiserver_port }}
{% endif %} {% endif %}
etcd: etcd:
external: external:

Loading…
Cancel
Save