Revert "Support for disabling apiserver insecure port" (#1974)

roles/kubernetes/master/handlers/main.yml

@@ -66,10 +66,7 @@
 
 - name: Master | wait for the apiserver to be running
   uri:
-    url: "{{ kube_apiserver_endpoint }}/healthz"
-    validate_certs: no
-    client_cert: "{{ kube_cert_dir }}/apiserver.pem"
-    client_key: "{{ kube_cert_dir }}/apiserver-key.pem"
+    url: "{{ kube_apiserver_insecure_endpoint }}/healthz"
   register: result
   until: result.status == 200
   retries: 20

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

@@ -110,17 +110,9 @@ spec:
       httpGet:
         host: 127.0.0.1
         path: /healthz
-{% if kube_apiserver_insecure_port == 0 %}
-        port: {{ kube_apiserver_port }}
-        scheme: HTTPS
-{% else %}
         port: {{ kube_apiserver_insecure_port }}
-{% endif %}
-      failureThreshold: 8
-      initialDelaySeconds: 15
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 15
+      initialDelaySeconds: 30
+      timeoutSeconds: 10
     volumeMounts:
     - mountPath: {{ kube_config_dir }}
       name: kubernetes-config