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

pull/1627/head
Matthew Mosesohn 2017-09-09 23:41:48 +03:00 committed by GitHub
parent 0f231f0e76
commit 75b13caf0b
4 changed files with 7 additions and 2 deletions

View File

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

View File

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

View File

@ -32,6 +32,10 @@
{%- endif -%} {%- endif -%}
{%- 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: - set_fact:
etcd_address: "{{ ip | default(ansible_default_ipv4['address']) }}" etcd_address: "{{ ip | default(ansible_default_ipv4['address']) }}"

View File

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