From cc6c44321636284d6b4539f236568fc25808b9d9 Mon Sep 17 00:00:00 2001
From: Eduard Tomas <etomas@gmail.com>
Date: Wed, 5 Jul 2017 16:01:14 +0200
Subject: [PATCH] Upfate catalog config on k8s

---
 k8s/conf_local.yml   | 3 ++-
 k8s/deploy.ps1       | 9 +++++----
 k8s/deployments.yaml | 9 +++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/k8s/conf_local.yml b/k8s/conf_local.yml
index 5314467c4..1193fc36d 100644
--- a/k8s/conf_local.yml
+++ b/k8s/conf_local.yml
@@ -9,6 +9,7 @@ data:
   BasketRedisConStr: basket-data
   CatalogBus: rabbitmq
   CatalogSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;
+  CatalogAzureStorageEnabled: "False"
   IdentitySqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;
   LocationsBus: rabbitmq
   LocationsNoSqlDb: mongodb://nosql-data
@@ -23,4 +24,4 @@ data:
   GracePeriodTime: "1"
   GracePeriodCheckUpdateTime: "60000"
   UseAzureServiceBus: "False"
-  keystore: keystore-data
\ No newline at end of file
+  keystore: keystore-data
diff --git a/k8s/deploy.ps1 b/k8s/deploy.ps1
index 7eb7eb92b..70a8ad817 100644
--- a/k8s/deploy.ps1
+++ b/k8s/deploy.ps1
@@ -134,13 +134,14 @@ Write-Host "Using $externalDns as the external DNS/IP of the k8s cluster"
 ExecKube -cmd 'create configmap urls `
     --from-literal=BasketUrl=http://basket `
     --from-literal=BasketHealthCheckUrl=http://basket/hc `
-    --from-literal=CatalogUrl=http://$($frontendUrl)/catalog-api `
+    --from-literal=CatalogUrl=http://$($externalDns)/catalog-api `
     --from-literal=CatalogHealthCheckUrl=http://catalog/hc `
-    --from-literal=IdentityUrl=http://$($frontendUrl)/identity `
+	--from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/pic/ `
+    --from-literal=IdentityUrl=http://$($externalDns)/identity `
     --from-literal=IdentityHealthCheckUrl=http://identity/hc `
     --from-literal=OrderingUrl=http://ordering `
     --from-literal=OrderingHealthCheckUrl=http://ordering/hc `
-    --from-literal=MvcClientExternalUrl=http://$($frontendUrl)/webmvc `
+    --from-literal=MvcClientExternalUrl=http://$($externalDns)/webmvc `
     --from-literal=WebMvcHealthCheckUrl=http://webmvc/hc `
     --from-literal=MvcClientOrderingUrl=http://ordering `
     --from-literal=MvcClientCatalogUrl=http://catalog `
@@ -192,5 +193,5 @@ ExecKube -cmd 'rollout resume deployments/webmvc'
 ExecKube -cmd 'rollout resume deployments/webstatus'
 ExecKube -cmd 'rollout resume deployments/webspa'
 
-Write-Host "WebSPA is exposed at http://$frontendUrl, WebMVC at http://$frontendUrl/webmvc, WebStatus at http://$frontendUrl/webstatus" -ForegroundColor Yellow
+Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow
 
diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml
index 050e16574..6eec27278 100644
--- a/k8s/deployments.yaml
+++ b/k8s/deployments.yaml
@@ -66,11 +66,16 @@ spec:
            configMapKeyRef:
              name: externalcfg
              key: CatalogSqlDb
-        - name: ExternalCatalogBaseUrl
+        - name: PicBaseUrl
           valueFrom:
            configMapKeyRef:
              name: urls
-             key: CatalogUrl
+             key: PicBaseUrl
+        - name: AzureStorageEnabled
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: CatalogAzureStorageEnabled
         - name: EventBusConnection
           valueFrom:
            configMapKeyRef: