diff --git a/ingress/templates/bin/_ingress-controller.sh.tpl b/ingress/templates/bin/_ingress-controller.sh.tpl index b041062e8..4e5d90f1c 100644 --- a/ingress/templates/bin/_ingress-controller.sh.tpl +++ b/ingress/templates/bin/_ingress-controller.sh.tpl @@ -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} \ diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 7cdfbf954..567cd5ef0 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -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 diff --git a/ingress/values.yaml b/ingress/values.yaml index 1a694c1b4..72855f0f4 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -162,6 +162,8 @@ endpoints: default: 80 https: default: 443 + healthz: + default: 10254 status: default: 18080 ingress_exporter: