openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Ingress: Make healthz port configurable"

Browse Source
This commit is contained in:
Zuul 2018-11-21 20:01:26 +00:00 committed by Gerrit Code Review
commit 89b651dc1d
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 }} {{- end }}
--http-port=${PORT_HTTP} \ --http-port=${PORT_HTTP} \
--https-port=${PORT_HTTPS} \ --https-port=${PORT_HTTPS} \
--healthz-port=${PORT_HEALTHZ} \
--status-port=${PORT_STATUS} \ --status-port=${PORT_STATUS} \
--election-id=${RELEASE_NAME} \ --election-id=${RELEASE_NAME} \
--ingress-class=${INGRESS_CLASS} \ --ingress-class=${INGRESS_CLASS} \

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

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

2
ingress/values.yaml
View File

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