Merge pull request #1083 from holser/api_port

Change kube-api default port from 443 to 6443

docs/ha-mode.md

@@ -61,8 +61,8 @@ listen kubernetes-apiserver-https
   mode tcp
   timeout client 3h
   timeout server 3h
-  server master1 <IP1>:443
-  server master2 <IP2>:443
+  server master1 <IP1>:6443
+  server master2 <IP2>:6443
   balance roundrobin
 ```
 

inventory/group_vars/all.yml

@@ -21,7 +21,7 @@
 #loadbalancer_apiserver_localhost: true
 
 ## Local loadbalancer should use this port instead, if defined.
-## Defaults to kube_apiserver_port (443)
+## Defaults to kube_apiserver_port (6443)
 #nginx_kube_apiserver_port: 8443
 
 ### OTHER OPTIONAL VARIABLES

inventory/group_vars/k8s-cluster.yml

@@ -76,7 +76,7 @@ kube_network_node_prefix: 24
 
 # The port the API Server will be listening on.
 kube_apiserver_ip: "{{ kube_service_addresses|ipaddr('net')|ipaddr(1)|ipaddr('address') }}"
-kube_apiserver_port: 443 # (https)
+kube_apiserver_port: 6443 # (https)
 kube_apiserver_insecure_port: 8080 # (http)
 
 # DNS configuration.

roles/kargo-defaults/defaults/main.yaml

@@ -91,7 +91,7 @@ kube_network_node_prefix: 24
 
 # The port the API Server will be listening on.
 kube_apiserver_ip: "{{ kube_service_addresses|ipaddr('net')|ipaddr(1)|ipaddr('address') }}"
-kube_apiserver_port: 443 # (https)
+kube_apiserver_port: 6443 # (https)
 kube_apiserver_insecure_port: 8080 # (http)
 
 # Path used to store Docker data

roles/kubernetes-apps/ansible/templates/calico-policy-controller.yml.j2

@@ -45,7 +45,7 @@ spec:
             # changed so long as it is used in conjunction with
             # CONFIGURE_ETC_HOSTS="true".
             - name: K8S_API
-              value: "https://kubernetes.default:443"
+              value: "https://kubernetes.default:{{ kube_apiserver_port }}"
             # Configure /etc/hosts within the container to resolve
             # the kubernetes.default Service to the correct clusterIP
             # using the environment provided by the kubelet.

tests/testcases/010_check-apiserver.yml

@@ -4,7 +4,7 @@
   tasks:
   - name: Check the API servers are responding
     uri:
-      url: "https://{{ansible_ssh_host}}/api/v1"
+      url: "https://{{ access_ip | default(ansible_default_ipv4.address) }}:{{ kube_apiserver_port }}/api/v1"
       user: kube
       password: changeme
       validate_certs: no