From 39c65a961171878e621fbef31c81b0a399cebd88 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 3 May 2018 17:28:32 -0500
Subject: [PATCH] Mistral: Fix endpoint creation

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

Change-Id: I6228809286cff55b23584b357a1e3d2caf8d22fb
---
 mistral/templates/configmap-etc.yaml       | 2 +-
 mistral/templates/deployment-api.yaml      | 4 ++--
 mistral/templates/ingress-api.yaml         | 2 +-
 mistral/templates/job-ks-endpoints.yaml    | 2 +-
 mistral/templates/job-ks-service.yaml      | 2 +-
 mistral/templates/service-api.yaml         | 4 ++--
 mistral/templates/service-ingress-api.yaml | 2 +-
 mistral/values.yaml                        | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml
index 542b5c7c7b..8e28303c94 100644
--- a/mistral/templates/configmap-etc.yaml
+++ b/mistral/templates/configmap-etc.yaml
@@ -60,7 +60,7 @@ limitations under the License.
 {{- 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 -}}
+{{- tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.mistral.api "port" | quote | trunc 0 -}}
 {{- end -}}
 
 ---
diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml
index 4c221745f6..2dd75296f7 100644
--- a/mistral/templates/deployment-api.yaml
+++ b/mistral/templates/deployment-api.yaml
@@ -64,10 +64,10 @@ spec:
                   - stop
           ports:
             - 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:
             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:
             - name: pod-etc-mistral
               mountPath: /etc/mistral
diff --git a/mistral/templates/ingress-api.yaml b/mistral/templates/ingress-api.yaml
index e567fba9bd..802e277801 100644
--- a/mistral/templates/ingress-api.yaml
+++ b/mistral/templates/ingress-api.yaml
@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- 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" }}
 {{- end }}
diff --git a/mistral/templates/job-ks-endpoints.yaml b/mistral/templates/job-ks-endpoints.yaml
index b30c022496..0758500f20 100644
--- a/mistral/templates/job-ks-endpoints.yaml
+++ b/mistral/templates/job-ks-endpoints.yaml
@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- 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" }}
 {{- end }}
diff --git a/mistral/templates/job-ks-service.yaml b/mistral/templates/job-ks-service.yaml
index 8877dfb18c..ce42f8fb33 100644
--- a/mistral/templates/job-ks-service.yaml
+++ b/mistral/templates/job-ks-service.yaml
@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- 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" }}
 {{- end }}
diff --git a/mistral/templates/service-api.yaml b/mistral/templates/service-api.yaml
index e5b9b512ca..9c63e09443 100644
--- a/mistral/templates/service-api.yaml
+++ b/mistral/templates/service-api.yaml
@@ -20,11 +20,11 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 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:
   ports:
     - 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 }}
       nodePort: {{ .Values.network.api.node_port.port }}
     {{ end }}
diff --git a/mistral/templates/service-ingress-api.yaml b/mistral/templates/service-ingress-api.yaml
index 0c76f4678f..ce3a58b781 100644
--- a/mistral/templates/service-ingress-api.yaml
+++ b/mistral/templates/service-ingress-api.yaml
@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- 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" }}
 {{- end }}
diff --git a/mistral/values.yaml b/mistral/values.yaml
index 1577fc2e02..a3ab7db815 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -196,7 +196,7 @@ endpoints:
         default: 35357
       api:
         default: 80
-  workflow:
+  workflowv2:
     name: mistral
     hosts:
       default: mistral-api