Revert "Change for the kube_apiserver_insecure_port parameter to use the defined variable"

This reverts commit fabc9017a4.
This commit is contained in:
Gregory Storme 2017-05-16 01:38:46 +02:00
parent 53e6a2061f
commit 2304fecdd9
4 changed files with 6 additions and 6 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: http://localhost:8080/healthz
register: result register: result
until: result.status == 200 until: result.status == 200
retries: 10 retries: 10

View file

@ -38,7 +38,7 @@ spec:
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz
port: {{ kube_apiserver_insecure_port }} port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 60
timeoutSeconds: 5 timeoutSeconds: 5
@ -107,9 +107,9 @@ spec:
memory: 50Mi memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1:10053 >/dev/null - -cmd=nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1:10053 >/dev/null
- -port={{ kube_apiserver_insecure_port }} - -port=8080
- -quiet - -quiet
ports: ports:
- containerPort: {{ kube_apiserver_insecure_port }} - containerPort: 8080
protocol: TCP protocol: TCP
dnsPolicy: Default # Don't use cluster DNS. dnsPolicy: Default # Don't use cluster DNS.

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: http://localhost:8080/healthz
register: result register: result
until: result.status == 200 until: result.status == 200
retries: 20 retries: 20

View file

@ -92,7 +92,7 @@ spec:
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
path: /healthz path: /healthz
port: {{ kube_apiserver_insecure_port }} port: 8080
initialDelaySeconds: 30 initialDelaySeconds: 30
timeoutSeconds: 10 timeoutSeconds: 10
volumeMounts: volumeMounts: