C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Uses a variable to define a custom flag instead of directly.

Browse source 
The flag '--kubelet-preferred-address-types' is now defined as part of
the existing 'apiserver_custom_flags' parameter.
This commit is contained in:
Ayaz Ahmed Khan 2017-07-13 11:29:52 +05:00
parent a2c1d153da
commit baf5d5a761
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/master/defaults/main.yml
View file

@ -60,7 +60,7 @@ kube_oidc_auth: false
# kube_oidc_groups_claim: groups # kube_oidc_groups_claim: groups
##Variables for custom flags ##Variables for custom flags
apiserver_custom_flags: [] apiserver_custom_flags: ['--kubelet-preferred-address-types=InternalDNS,InternalIP,Hostname,ExternalDNS,ExternalIP']
controller_mgr_custom_flags: [] controller_mgr_custom_flags: []

1
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View file

@ -36,7 +36,6 @@ spec:
- --admission-control={{ kube_apiserver_admission_control | join(',') }} - --admission-control={{ kube_apiserver_admission_control | join(',') }}
- --service-cluster-ip-range={{ kube_service_addresses }} - --service-cluster-ip-range={{ kube_service_addresses }}
- --service-node-port-range={{ kube_apiserver_node_port_range }} - --service-node-port-range={{ kube_apiserver_node_port_range }}
- --kubelet-preferred-address-types=InternalDNS,InternalIP,Hostname,ExternalDNS,ExternalIP
- --client-ca-file={{ kube_cert_dir }}/ca.pem - --client-ca-file={{ kube_cert_dir }}/ca.pem
{% if kube_basic_auth|default(true) %} {% if kube_basic_auth|default(true) %}
- --basic-auth-file={{ kube_users_dir }}/known_users.csv - --basic-auth-file={{ kube_users_dir }}/known_users.csv