Browse Source
Merge pull request #3193 from riverzhang/fix-lb-kubeadm
Fix kubeadm lb
pull/3198/head
k8s-ci-robot
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
6 deletions
-
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
-
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
|
|
|
@ -1,10 +1,11 @@ |
|
|
|
apiVersion: kubeadm.k8s.io/v1alpha2 |
|
|
|
kind: MasterConfiguration |
|
|
|
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 %} |
|
|
|
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 %} |
|
|
|
etcd: |
|
|
|
external: |
|
|
|
|
|
|
|
@ -1,10 +1,11 @@ |
|
|
|
apiVersion: kubeadm.k8s.io/v1alpha2 |
|
|
|
kind: MasterConfiguration |
|
|
|
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 %} |
|
|
|
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 %} |
|
|
|
etcd: |
|
|
|
external: |
|
|
|
|
