Browse Source

Fix kube-apiserver status checks when changing insecure bind addr (#1633)

pull/1627/head
Matthew Mosesohn 7 years ago
committed by GitHub
parent
commit
75b13caf0b
4 changed files with 7 additions and 2 deletions
  1. 2
      roles/kubernetes-apps/ansible/tasks/main.yml
  2. 2
      roles/kubernetes/master/handlers/main.yml
  3. 4
      roles/kubernetes/preinstall/tasks/set_facts.yml
  4. 1
      roles/kubespray-defaults/defaults/main.yaml

2
roles/kubernetes-apps/ansible/tasks/main.yml

@ -1,7 +1,7 @@
---
- name: Kubernetes Apps | Wait for kube-apiserver
uri:
url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz
url: "{{ kube_apiserver_insecure_endpoint }}/healthz"
register: result
until: result.status == 200
retries: 10

2
roles/kubernetes/master/handlers/main.yml

@ -39,7 +39,7 @@
- name: Master | wait for the apiserver to be running
uri:
url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz
url: "{{ kube_apiserver_insecure_endpoint }}/healthz"
register: result
until: result.status == 200
retries: 20

4
roles/kubernetes/preinstall/tasks/set_facts.yml

@ -32,6 +32,10 @@
{%- endif -%}
{%- endif %}
- set_fact:
kube_apiserver_insecure_endpoint: >-
http://{{ kube_apiserver_insecure_bind_address | regex_replace('0\.0\.0\.0','127.0.0.1') }}:{{ kube_apiserver_insecure_port }}
- set_fact:
etcd_address: "{{ ip | default(ansible_default_ipv4['address']) }}"

1
roles/kubespray-defaults/defaults/main.yaml

@ -92,6 +92,7 @@ kube_apiserver_ip: "{{ kube_service_addresses|ipaddr('net')|ipaddr(1)|ipaddr('ad
# https
kube_apiserver_port: 6443
# http
kube_apiserver_insecure_bind_address: 127.0.0.1
kube_apiserver_insecure_port: 8080
# Path used to store Docker data

Loading…
Cancel
Save