openstack/openstack-helm
Code Issues Proposed changes

Mistral: Fix endpoint creation

Browse Source 
This PS fixes the mistral endpoint creation to allow the service to
operate.

Change-Id: I6228809286cff55b23584b357a1e3d2caf8d22fb
This commit is contained in:
Pete Birley
2018-05-03 17:28:32 -05:00
parent de72d74ae6
commit 39c65a9611
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mistral/templates/configmap-etc.yaml
View File

@@ -60,7 +60,7 @@ limitations under the License.
{{- end -}} {{- end -}}
{{- if empty .Values.conf.mistral.api.port -}} {{- 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 -}} {{- tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.mistral.api "port" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
--- ---

4
mistral/templates/deployment-api.yaml
View File

@@ -64,10 +64,10 @@ spec:
- stop - stop
ports: ports:
- name: w-api - name: w-api
containerPort: {{ tuple "workflow" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} containerPort: {{ tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
readinessProbe: readinessProbe:
tcpSocket: tcpSocket:
port: {{ tuple "workflow" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
volumeMounts: volumeMounts:
- name: pod-etc-mistral - name: pod-etc-mistral
mountPath: /etc/mistral mountPath: /etc/mistral

2
mistral/templates/ingress-api.yaml
View File

@@ -15,6 +15,6 @@ limitations under the License.
*/}} */}}
{{- if and .Values.manifests.ingress_api .Values.network.api.ingress.public }} {{- if and .Values.manifests.ingress_api .Values.network.api.ingress.public }}
{{- $ingressOpts := dict "envAll" . "backendServiceType" "workflow" "backendPort" "w-api" -}} {{- $ingressOpts := dict "envAll" . "backendServiceType" "workflowv2" "backendPort" "w-api" -}}
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
{{- end }} {{- end }}

2
mistral/templates/job-ks-endpoints.yaml
View File

@@ -15,6 +15,6 @@ limitations under the License.
*/}} */}}
{{- if .Values.manifests.job_ks_endpoints }} {{- if .Values.manifests.job_ks_endpoints }}
{{- $ksServiceJob := dict "envAll" . "serviceName" "mistral" "serviceTypes" ( tuple "workflow" ) -}} {{- $ksServiceJob := dict "envAll" . "serviceName" "mistral" "serviceTypes" ( tuple "workflowv2" ) -}}
{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
{{- end }} {{- end }}

2
mistral/templates/job-ks-service.yaml
View File

@@ -15,6 +15,6 @@ limitations under the License.
*/}} */}}
{{- if .Values.manifests.job_ks_service }} {{- if .Values.manifests.job_ks_service }}
{{- $ksServiceJob := dict "envAll" . "serviceName" "mistral" "serviceTypes" ( tuple "workflow" ) -}} {{- $ksServiceJob := dict "envAll" . "serviceName" "mistral" "serviceTypes" ( tuple "workflowv2" ) -}}
{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }}
{{- end }} {{- end }}

4
mistral/templates/service-api.yaml
View File

@@ -20,11 +20,11 @@ limitations under the License.
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ tuple "workflow" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} name: {{ tuple "workflowv2" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
spec: spec:
ports: ports:
- name: w-api - name: w-api
port: {{ tuple "workflow" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} port: {{ tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ if .Values.network.api.node_port.enabled }} {{ if .Values.network.api.node_port.enabled }}
nodePort: {{ .Values.network.api.node_port.port }} nodePort: {{ .Values.network.api.node_port.port }}
{{ end }} {{ end }}

2
mistral/templates/service-ingress-api.yaml
View File

@@ -15,6 +15,6 @@ limitations under the License.
*/}} */}}
{{- if and .Values.manifests.service_ingress_api .Values.network.api.ingress.public }} {{- if and .Values.manifests.service_ingress_api .Values.network.api.ingress.public }}
{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "workflow" -}} {{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "workflowv2" -}}
{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }} {{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
{{- end }} {{- end }}

2
mistral/values.yaml
View File

@@ -196,7 +196,7 @@ endpoints:
default: 35357 default: 35357
api: api:
default: 80 default: 80
workflow: workflowv2:
name: mistral name: mistral
hosts: hosts:
default: mistral-api default: mistral-api