add parameter to allow redefining of server port for ingress
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:
parent
0730df5973
commit
5ac56d9307
@ -30,6 +30,7 @@ function start () {
|
||||
--https-port=${PORT_HTTPS} \
|
||||
--healthz-port=${PORT_HEALTHZ} \
|
||||
--status-port=${PORT_STATUS} \
|
||||
--default-server-port=${DEFAULT_SERVER_PORT} \
|
||||
--election-id=${RELEASE_NAME} \
|
||||
--ingress-class=${INGRESS_CLASS} \
|
||||
--default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
|
||||
|
@ -259,6 +259,8 @@ spec:
|
||||
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: DEFAULT_SERVER_PORT
|
||||
value: {{ tuple "ingress" "internal" "server" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
||||
- name: RELEASE_NAME
|
||||
value: {{ .Release.Name | quote }}
|
||||
- name: ERROR_PAGE_SERVICE
|
||||
@ -281,6 +283,10 @@ spec:
|
||||
{{- if .Values.network.host_namespace }}
|
||||
hostPort: {{ tuple "ingress" "internal" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
{{- 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:
|
||||
- /tmp/ingress-controller.sh
|
||||
- start
|
||||
|
@ -165,6 +165,8 @@ endpoints:
|
||||
default: 10254
|
||||
status:
|
||||
default: 18080
|
||||
server:
|
||||
default: 8181
|
||||
ingress_exporter:
|
||||
namespace: null
|
||||
hosts:
|
||||
|
Loading…
Reference in New Issue
Block a user