Merge pull request #2418 from kubernetes-incubator/1439br

Explicitly defines the --kubelet-preferred-address-types parameter

roles/kubernetes/master/defaults/main.yml

@@ -78,6 +78,9 @@ kube_oidc_auth: false
 ## Variables for custom flags
 apiserver_custom_flags: []
 
+# List of the preferred NodeAddressTypes to use for kubelet connections.
+kubelet_preferred_address_types: 'InternalDNS,InternalIP,Hostname,ExternalDNS,ExternalIP'
+
 controller_mgr_custom_flags: []
 
 scheduler_custom_flags: []

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

@@ -51,6 +51,7 @@ spec:
     - --kubelet-client-certificate={{ kube_cert_dir }}/node-{{ inventory_hostname }}.pem
     - --kubelet-client-key={{ kube_cert_dir }}/node-{{ inventory_hostname }}-key.pem
     - --service-account-lookup=true
+    - --kubelet-preferred-address-types={{ kubelet_preferred_address_types }}
 {% if kube_basic_auth|default(true) %}
     - --basic-auth-file={{ kube_users_dir }}/known_users.csv
 {% endif %}