From 661c7cec155656091548b3deef3ad814cc590036 Mon Sep 17 00:00:00 2001 From: Gregory Storme Date: Tue, 16 May 2017 01:51:55 +0200 Subject: [PATCH] Set kube_apiserver_insecure_port parameter to use the defined variable undo changes to kubedns healthz endpoint --- roles/kubernetes-apps/ansible/tasks/main.yml | 2 +- roles/kubernetes/master/handlers/main.yml | 2 +- .../master/templates/manifests/kube-apiserver.manifest.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml index ed0d11f28..cd7069831 100644 --- a/roles/kubernetes-apps/ansible/tasks/main.yml +++ b/roles/kubernetes-apps/ansible/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Kubernetes Apps | Wait for kube-apiserver uri: - url: http://localhost:8080/healthz + url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz register: result until: result.status == 200 retries: 10 diff --git a/roles/kubernetes/master/handlers/main.yml b/roles/kubernetes/master/handlers/main.yml index 94cec7d1b..e408ce04e 100644 --- a/roles/kubernetes/master/handlers/main.yml +++ b/roles/kubernetes/master/handlers/main.yml @@ -39,7 +39,7 @@ - name: Master | wait for the apiserver to be running uri: - url: http://localhost:8080/healthz + url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz register: result until: result.status == 200 retries: 20 diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index b0f1a2f53..6935fbfb6 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -92,7 +92,7 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 8080 + port: {{ kube_apiserver_insecure_port }} initialDelaySeconds: 30 timeoutSeconds: 10 volumeMounts: