openstack/openstack-helm-infra
Code Issues Proposed changes

Ingress: Allow status port to be customised

Browse Source 
This PS updates the ingress chart to allow the status pport to be
changed.

Change-Id: Ia38223c56806f6113622a809e792b4fedd010d87
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-11-20 09:57:56 -06:00
parent 5d356f9265
commit f3e1fa4e72
4 changed files with 13 additions and 0 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} \
--status-port=${PORT_STATUS} \
--election-id=${RELEASE_NAME} \ --election-id=${RELEASE_NAME} \
--ingress-class=${INGRESS_CLASS} \ --ingress-class=${INGRESS_CLASS} \
--default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \ --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \

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

@ -255,6 +255,8 @@ spec:
value: {{ tuple "ingress" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "ingress" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: PORT_HTTPS - name: PORT_HTTPS
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
value: {{ tuple "ingress" "internal" "status" . | 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
@ -269,6 +271,10 @@ spec:
{{- if .Values.network.host_namespace }} {{- if .Values.network.host_namespace }}
hostPort: {{ tuple "ingress" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} hostPort: {{ tuple "ingress" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- end }} {{- end }}
- containerPort: {{ tuple "ingress" "internal" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- if .Values.network.host_namespace }}
hostPort: {{ tuple "ingress" "internal" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- end }}
command: command:
- /tmp/ingress-controller.sh - /tmp/ingress-controller.sh
- start - start

4
ingress/templates/service-ingress.yaml
View File

@ -39,6 +39,10 @@ spec:
port: {{ tuple "ingress" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "ingress" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
protocol: TCP protocol: TCP
targetPort: {{ tuple "ingress" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} targetPort: {{ tuple "ingress" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- name: status
port: {{ tuple "ingress" "internal" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
protocol: TCP
targetPort: {{ tuple "ingress" "internal" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- if not (empty $envAll.Values.conf.services.tcp) }} {{- if not (empty $envAll.Values.conf.services.tcp) }}
{{range $key, $value := $envAll.Values.conf.services.tcp -}} {{range $key, $value := $envAll.Values.conf.services.tcp -}}
- name: {{ cat ((( $value | split "/" )._1 | split ":" )._0 | trunc 8 ) $key | nospace | quote }} - name: {{ cat ((( $value | split "/" )._1 | split ":" )._0 | trunc 8 ) $key | nospace | quote }}

2
ingress/values.yaml
View File

@ -162,6 +162,8 @@ endpoints:
default: 80 default: 80
https: https:
default: 443 default: 443
status:
default: 18080
ingress_exporter: ingress_exporter:
namespace: null namespace: null
hosts: hosts: