openstack/openstack-helm-infra
Code Issues Proposed changes

add parameter to allow redefining of server port for ingress

Browse Source 
To allow to integrate TungstenFabric(Contrail) with Airship
there should be ability to redifine ports that can be conflicted.

Change-Id: Id15658c65339577cec03f25ebd22dd664bb5976a
This commit is contained in:
Andrey Pavlov 2018-11-18 15:12:45 +03:00
parent 0730df5973
commit 5ac56d9307
3 changed files with 9 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

@ -30,6 +30,7 @@ function start () {
--https-port=${PORT_HTTPS} \ --https-port=${PORT_HTTPS} \
--healthz-port=${PORT_HEALTHZ} \ --healthz-port=${PORT_HEALTHZ} \
--status-port=${PORT_STATUS} \ --status-port=${PORT_STATUS} \
--default-server-port=${DEFAULT_SERVER_PORT} \
--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

@ -259,6 +259,8 @@ spec:
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 - name: PORT_HEALTHZ
value: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: DEFAULT_SERVER_PORT
value: {{ tuple "ingress" "internal" "server" . | 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
@ -281,6 +283,10 @@ spec:
{{- if .Values.network.host_namespace }} {{- if .Values.network.host_namespace }}
hostPort: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} hostPort: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- end }} {{- end }}
- containerPort: {{ tuple "ingress" "internal" "server" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- if .Values.network.host_namespace }}
hostPort: {{ tuple "ingress" "internal" "server" . | 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

@ -165,6 +165,8 @@ endpoints:
default: 10254 default: 10254
status: status:
default: 18080 default: 18080
server:
default: 8181
ingress_exporter: ingress_exporter:
namespace: null namespace: null
hosts: hosts: