From 8ca63522c31ecf6f9c4e148c15f64cb92f0bf0e4 Mon Sep 17 00:00:00 2001
From: eiximenis <etomas@gmail.com>
Date: Tue, 3 Jul 2018 20:05:58 +0200
Subject: [PATCH] minor fixes

---
 k8s/helm/app.yaml                              | 2 +-
 k8s/helm/deploy-all.ps1                        | 6 +++---
 k8s/helm/identity-api/templates/configmap.yaml | 4 ++--
 k8s/helm/inf.yaml                              | 2 +-
 k8s/helm/webspa/values.yaml                    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/k8s/helm/app.yaml b/k8s/helm/app.yaml
index 826c41632..6ca5d9d31 100644
--- a/k8s/helm/app.yaml
+++ b/k8s/helm/app.yaml
@@ -11,7 +11,7 @@ app:                                                  # app global settings
       ordering: ordering-api                          # ingress entry for ordering api
       identity: identity                              # ingress entry for identity api
       mvc: webmvc                                     # ingress entry for web mvc
-      spa: webspa                                     # ingress entry for web spa
+      spa: ""                                         # ingress entry for web spa
       status: webstatus                               # ingress entry for web status
       webshoppingapigw: webshoppingapigw              # ingress entry for web shopping Agw
       webmarketingapigw: webmarketingapigw            # ingress entry for web mkg Agw
diff --git a/k8s/helm/deploy-all.ps1 b/k8s/helm/deploy-all.ps1
index a77d5d030..4a90387cd 100644
--- a/k8s/helm/deploy-all.ps1
+++ b/k8s/helm/deploy-all.ps1
@@ -45,18 +45,18 @@ $useDockerHub = [string]::IsNullOrEmpty($registry)
 Write-Host "Begin eShopOnContainers installation using Helm" -ForegroundColor Green
 
 $infras = ("sql-data", "nosql-data", "rabbitmq", "keystore-data", "basket-data")
-$charts = ("eshop-common", "apigwmm", "apigwms", "apigwwm", "apigwws", "basket-api","catalog-api", "-api", "locations-api", "marketing-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus")
+$charts = ("eshop-common", "apigwmm", "apigwms", "apigwwm", "apigwws", "basket-api","catalog-api", "identity-api", "locations-api", "marketing-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus")
 
 if ($deployInfrastructure) {
     foreach ($infra in $infras) {
         Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
-        helm install --values app.yaml --values inf.yaml --values ingress_values.yaml --set appName=$appName --set inf.k8s.dns=$dns --name="$appName-$infra" $infra     
+        helm install --values app.yaml --values inf.yaml --values ingress_values.yaml --set app.name=$appName --set inf.k8s.dns=$dns --name="$appName-$infra" $infra     
     }
 }
 
 foreach ($chart in $charts) {
     Write-Host "Installing: $chart" -ForegroundColor Green
-    helm install --values app.yaml --values inf.yaml --values ingress_values.yaml --set appName=$appName --set inf.k8s.dns=$dns --set image.tag=$imageTag --name="$appName-$chart" $chart 
+    helm install --values app.yaml --values inf.yaml --values ingress_values.yaml --set app.name=$appName --set inf.k8s.dns=$dns --set image.tag=$imageTag --name="$appName-$chart" $chart 
 }
 
 Write-Host "helm charts installed." -ForegroundColor Green
diff --git a/k8s/helm/identity-api/templates/configmap.yaml b/k8s/helm/identity-api/templates/configmap.yaml
index bb22d27f8..3a71f1a81 100644
--- a/k8s/helm/identity-api/templates/configmap.yaml
+++ b/k8s/helm/identity-api/templates/configmap.yaml
@@ -21,8 +21,8 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   identity__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.identity.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
-  identity__keystore: http://{{ .Values.inf.redis.keystore.constr }}
-  all__InstrumentationKey: http://{{ .Values.inf.appinsights.key }}
+  identity__keystore: {{ .Values.inf.redis.keystore.constr }}
+  all__InstrumentationKey: {{ .Values.inf.appinsights.key }}
   mvc_e: http://{{ $mvc_url }}
   spa_e: http://{{ $spa_url }}
   locations_e: http://{{ $locations_url }}
diff --git a/k8s/helm/inf.yaml b/k8s/helm/inf.yaml
index e0e0dc562..073e53dd4 100644
--- a/k8s/helm/inf.yaml
+++ b/k8s/helm/inf.yaml
@@ -35,7 +35,7 @@ inf:
       key: ""               # App insights to use
   k8s:                      # inf.k8s defines Kubernetes cluster global config
     dns:  ""                # k8s external IP or DNS. Value MUST BE PROVIDED using --set (--set inf.k8s.dns=my-cluster-dns)
-    dnsprefix: true         # If 'true' DNS values in ingress are prefixed using values.app.name. Note that this requires "externalDNS" to be running in k8s cluster. If true "inf.k8s.suffix" is ignored.
+    dnsprefix: false        # If 'true' DNS values in ingress are prefixed using values.app.name. Note that this requires "externalDNS" to be running in k8s cluster. If true "inf.k8s.suffix" is ignored.
     suffix: false           # If 'true' URL values in ingress are suffixed using values.app.name. That do not require anything special in cluster and still allows many apps using same ingress controller. Ignored if inf.k8s.dnsprefix is true
   misc:                     # inf.misc contains miscellaneous configuration related to infrastructure
     useLoadTest: false      # If running under loading test or not
diff --git a/k8s/helm/webspa/values.yaml b/k8s/helm/webspa/values.yaml
index 49821f276..e07909f6e 100644
--- a/k8s/helm/webspa/values.yaml
+++ b/k8s/helm/webspa/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 clusterName: eshop-aks
-pathBase: /webspa
+pathBase: /
 
 image:
   repository: eshop/webspa