From 631696c4ae88cf4f787e674cdeee28cca12a10ba Mon Sep 17 00:00:00 2001
From: eiximenis <etomas@gmail.com>
Date: Mon, 25 Feb 2019 13:27:26 +0100
Subject: [PATCH] Updated helm charts to support devspaces

---
 .gitignore                                 |  7 +++++-
 k8s/helm/apigwmm/templates/deployment.yaml |  2 +-
 k8s/helm/apigwmm/templates/ingress.yaml    |  7 ++++--
 k8s/helm/apigwmm/values.yaml               |  2 ++
 k8s/helm/apigwms/templates/deployment.yaml |  2 +-
 k8s/helm/apigwms/values.yaml               |  4 +++-
 k8s/helm/apigwwm/templates/deployment.yaml |  2 +-
 k8s/helm/apigwwm/values.yaml               |  4 +++-
 k8s/helm/deploy-all.ps1                    | 27 ++++++++++++++--------
 k8s/helm/webmvc/templates/ingress.yaml     |  7 ++++--
 10 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6bc27551d..2e9297be9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -265,4 +265,9 @@ pub/
 .mfractor
 
 # Ignore HealthCheckdb
-*healthchecksdb*
\ No newline at end of file
+*healthchecksdb*
+
+# Ignores all extra inf.yaml and app.yaml that are copied by prepare-devspaces.ps1
+src/**/app.yaml
+src/**/inf.yaml
+
diff --git a/k8s/helm/apigwmm/templates/deployment.yaml b/k8s/helm/apigwmm/templates/deployment.yaml
index 6dc58bf50..46e5bee24 100644
--- a/k8s/helm/apigwmm/templates/deployment.yaml
+++ b/k8s/helm/apigwmm/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           - name: config
-            mountPath: /app/configuration          
+            mountPath: {{ .Values.ocelot.configPath }}          
           env:
             - name: PATH_BASE
               value: {{ include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw  .) }}
diff --git a/k8s/helm/apigwmm/templates/ingress.yaml b/k8s/helm/apigwmm/templates/ingress.yaml
index 28e2aa84d..ec6d078bd 100644
--- a/k8s/helm/apigwmm/templates/ingress.yaml
+++ b/k8s/helm/apigwmm/templates/ingress.yaml
@@ -1,5 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw  .) -}}
+{{- $serviceName := .Values.app.svc.mobilemarketingapigw -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -23,11 +24,13 @@ spec:
   {{- end }}
 {{- end }}
   rules:
-    - host: {{ .Values.inf.k8s.dns }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
       http:
         paths:
           - path: {{ $ingressPath }}
             backend:
-              serviceName: {{ .Values.app.svc.mobilemarketingapigw }}
+              serviceName: {{ $serviceName }}
               servicePort: http
+  {{- end }}
 {{- end }}
diff --git a/k8s/helm/apigwmm/values.yaml b/k8s/helm/apigwmm/values.yaml
index 501266780..ea87a6c05 100644
--- a/k8s/helm/apigwmm/values.yaml
+++ b/k8s/helm/apigwmm/values.yaml
@@ -62,3 +62,5 @@ probes:
     initialDelaySeconds: 90
     periodSeconds: 60
     port: 80
+ocelot:
+  configPath: /app/configuration
diff --git a/k8s/helm/apigwms/templates/deployment.yaml b/k8s/helm/apigwms/templates/deployment.yaml
index 8a4fd8942..65522e986 100644
--- a/k8s/helm/apigwms/templates/deployment.yaml
+++ b/k8s/helm/apigwms/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           - name: config
-            mountPath: /app/configuration          
+            mountPath: {{ .Values ocelot.configPath }}         
           env:
             - name: PATH_BASE
               value: {{ include "pathBase" (list .Values.app.ingress.entries.mobileshoppingapigw  .) }}
diff --git a/k8s/helm/apigwms/values.yaml b/k8s/helm/apigwms/values.yaml
index 58377ec5b..650ab6449 100644
--- a/k8s/helm/apigwms/values.yaml
+++ b/k8s/helm/apigwms/values.yaml
@@ -61,4 +61,6 @@ probes:
     timeoutSeconds: 5
     initialDelaySeconds: 90
     periodSeconds: 60
-    port: 80
\ No newline at end of file
+    port: 80
+ocelot:
+  configPath: /app/configuration
\ No newline at end of file
diff --git a/k8s/helm/apigwwm/templates/deployment.yaml b/k8s/helm/apigwwm/templates/deployment.yaml
index 5cbce9f22..4f02bc2e9 100644
--- a/k8s/helm/apigwwm/templates/deployment.yaml
+++ b/k8s/helm/apigwwm/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           - name: config
-            mountPath: /app/configuration          
+            mountPath: {{ .Values ocelot.configPath }}
           env:
             - name: PATH_BASE
               value: {{ include "pathBase" (list .Values.app.ingress.entries.webmarketingapigw  .) }}
diff --git a/k8s/helm/apigwwm/values.yaml b/k8s/helm/apigwwm/values.yaml
index 68cbb89c4..63deb5832 100644
--- a/k8s/helm/apigwwm/values.yaml
+++ b/k8s/helm/apigwwm/values.yaml
@@ -61,4 +61,6 @@ probes:
     timeoutSeconds: 5
     initialDelaySeconds: 90
     periodSeconds: 60
-    port: 80
\ No newline at end of file
+    port: 80
+ocelot:
+  configPath: /app/configuration
\ No newline at end of file
diff --git a/k8s/helm/deploy-all.ps1 b/k8s/helm/deploy-all.ps1
index 1819c9a67..b7275891d 100644
--- a/k8s/helm/deploy-all.ps1
+++ b/k8s/helm/deploy-all.ps1
@@ -5,6 +5,7 @@ Param(
     [parameter(Mandatory=$false)][string]$externalDns,
     [parameter(Mandatory=$false)][string]$appName="eshop",
     [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
+    [parameter(Mandatory=$false)][bool]$deployCharts=$true,
     [parameter(Mandatory=$false)][bool]$clean=$true,
     [parameter(Mandatory=$false)][string]$aksName="",
     [parameter(Mandatory=$false)][string]$aksRg="",
@@ -66,21 +67,29 @@ $charts = ("eshop-common", "apigwmm", "apigwms", "apigwwm", "apigwws", "basket-a
 if ($deployInfrastructure) {
     foreach ($infra in $infras) {
         Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
-        helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --name="$appName-$infra" $infra     
+        helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts={$dns} --name="$appName-$infra" $infra     
     }
 }
+else {
+    Write-Host "eShopOnContainers infrastructure (bbdd, redis, ...) charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
 
-foreach ($chart in $charts) {
-    Write-Host "Installing: $chart" -ForegroundColor Green
-    if ($useCustomRegistry) {
-        helm install --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart 
-    }
-    else {
-        if ($chart -ne "eshop-common")  {       # eshop-common is ignored when no secret must be deployed
-            helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart 
+if ($deployCharts) {
+    foreach ($chart in $charts) {
+        Write-Host "Installing: $chart" -ForegroundColor Green
+        if ($useCustomRegistry) {
+            helm install --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts={$dns} --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart 
+        }
+        else {
+            if ($chart -ne "eshop-common")  {       # eshop-common is ignored when no secret must be deployed
+                helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns  --set ingress.hosts={$dns} --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart 
+            }
         }
     }
 }
+else {
+    Write-Host "eShopOnContainers non-infrastructure charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
 
 Write-Host "helm charts installed." -ForegroundColor Green
 
diff --git a/k8s/helm/webmvc/templates/ingress.yaml b/k8s/helm/webmvc/templates/ingress.yaml
index abfb62b2f..892fa4273 100644
--- a/k8s/helm/webmvc/templates/ingress.yaml
+++ b/k8s/helm/webmvc/templates/ingress.yaml
@@ -1,5 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mvc -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -23,11 +24,13 @@ spec:
   {{- end }}
 {{- end }}
   rules:
-    - host: {{ .Values.inf.k8s.dns }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
       http:
         paths:
           - path: {{ $ingressPath }}
             backend:
-              serviceName: {{  .Values.app.svc.mvc }}
+              serviceName: {{ $serviceName }}
               servicePort: http
+  {{- end }}
 {{- end }}