From 266ca9318d9ad735b0ac7ad95362b548caa57a54 Mon Sep 17 00:00:00 2001
From: Gregory Storme <gregory_storme@hotmail.com>
Date: Tue, 6 Jun 2017 18:36:04 +0200
Subject: [PATCH] Use the kube_apiserver_insecure_port variable instead of
static 8080
---
roles/kubernetes-apps/ansible/tasks/main.yml | 2 +-
roles/kubernetes/master/handlers/main.yml | 2 +-
.../master/templates/manifests/kube-apiserver.manifest.j2 | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml
index 9ec3b7ddc..4e7236df6 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 1cee58282..bf4979596 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:
@@ -124,4 +124,4 @@ spec:
- hostPath:
path: /etc/ssl/certs/ca-bundle.crt
name: rhel-ca-bundle
-{% endif %}
\ No newline at end of file
+{% endif %}
--
GitLab