diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml index 447a01ef97..20198c5939 100644 --- a/mistral/templates/configmap-etc.yaml +++ b/mistral/templates/configmap-etc.yaml @@ -61,6 +61,10 @@ limitations under the License. {{- tuple "oslo_messaging" "internal" "mistral" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.mistral.DEFAULT "transport_url" | quote | trunc 0 -}} {{- end -}} +{{- if empty .Values.conf.mistral.api.port -}} +{{- tuple "workflow" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.mistral.api "port" | quote | trunc 0 -}} +{{- end -}} + --- apiVersion: v1 kind: ConfigMap diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index 22dc3e39fe..4c221745f6 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -63,11 +63,11 @@ spec: - /tmp/mistral-api.sh - stop ports: - - name: {{ .Values.network.api.name }} - containerPort: {{ .Values.conf.mistral.api.port }} + - name: w-api + containerPort: {{ tuple "workflow" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} readinessProbe: tcpSocket: - port: {{ .Values.conf.mistral.api.port }} + port: {{ tuple "workflow" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} volumeMounts: - name: pod-etc-mistral mountPath: /etc/mistral diff --git a/mistral/templates/service-api.yaml b/mistral/templates/service-api.yaml index caf4bc5a61..e5b9b512ca 100644 --- a/mistral/templates/service-api.yaml +++ b/mistral/templates/service-api.yaml @@ -24,7 +24,7 @@ metadata: spec: ports: - name: w-api - port: {{ .Values.conf.mistral.api.port }} + port: {{ tuple "workflow" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{ if .Values.network.api.node_port.enabled }} nodePort: {{ .Values.network.api.node_port.port }} {{ end }} diff --git a/mistral/values.yaml b/mistral/values.yaml index b0dc5741bd..e956bd5ee6 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -311,10 +311,12 @@ conf: DEFAULT: transport_url: null api: - port: 8989 + #NOTE(portdirect): the bind port should not be defined, and is manipulated + # via the endpoints section. + port: null api_workers: 8 coordination: - backend_url: + backend_url: null database: max_retries: -1 keystone_authtoken: