openstack/openstack-helm-infra
Code Issues Proposed changes

Ingress: Make healthz port configurable

Browse Source 
This PS updates the healthz port to be configurable

Change-Id: Ifa5ea4b7b422156a7309886ecc21668fc096065b
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-11-20 10:31:44 -06:00
parent f3e1fa4e72
commit ea875b1dcc
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ingress/templates/bin/_ingress-controller.sh.tpl
View File

@ -27,6 +27,7 @@ function start () {
{{- end }}
--http-port=${PORT_HTTP} \
--https-port=${PORT_HTTPS} \
--healthz-port=${PORT_HEALTHZ} \
--status-port=${PORT_STATUS} \
--election-id=${RELEASE_NAME} \
--ingress-class=${INGRESS_CLASS} \

10
ingress/templates/deployment-ingress.yaml
View File

@ -233,12 +233,12 @@ spec:
readinessProbe:
httpGet:
path: /healthz
port: 10254
port: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
scheme: HTTP
livenessProbe:
httpGet:
path: /healthz
port: 10254
port: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
scheme: HTTP
initialDelaySeconds: 10
timeoutSeconds: 1
@ -257,6 +257,8 @@ spec:
value: {{ tuple "ingress" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: PORT_STATUS
value: {{ tuple "ingress" "internal" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: PORT_HEALTHZ
value: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: RELEASE_NAME
value: {{ .Release.Name | quote }}
- name: ERROR_PAGE_SERVICE
@ -275,6 +277,10 @@ spec:
{{- if .Values.network.host_namespace }}
hostPort: {{ tuple "ingress" "internal" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- end }}
- containerPort: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- if .Values.network.host_namespace }}
hostPort: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- end }}
command:
- /tmp/ingress-controller.sh
- start

2
ingress/values.yaml
View File

@ -162,6 +162,8 @@ endpoints:
default: 80
https:
default: 443
healthz:
default: 10254
status:
default: 18080
ingress_exporter: