From 9d16ff7732aa7c697d9f2419e818a3e2f61368b8 Mon Sep 17 00:00:00 2001
From: Andres Gomez Coronel <andresgomezcoronel@gmail.com>
Date: Wed, 26 May 2021 16:31:34 -0300
Subject: [PATCH] Updates json resource names to avoid issues with kustomize
 parsing yaml files

Signed-off-by: Andres Gomez Coronel <andresgomezcoronel@gmail.com>
---
 .../k8s/backend/json/balances/{1 => balance_1}       |  0
 .../k8s/backend/json/balances/{2 => balance_2}       |  0
 .../k8s/backend/json/profiles/{1 => profile_1}       |  0
 .../k8s/backend/json/profiles/{2 => profile_2}       |  0
 .../backend/json/transactions/{1 => transaction_1}   |  0
 .../backend/json/transactions/{2 => transaction_2}   |  0
 .../k8s/frontend-2/config/symbank-webapp-2.conf      |  6 +++---
 .../k8s/frontend/config/symbank-webapp.conf          |  6 +++---
 k8s/envoy-x509/k8s/kustomization.yaml                | 12 ++++++------
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename k8s/envoy-x509/k8s/backend/json/balances/{1 => balance_1} (100%)
 rename k8s/envoy-x509/k8s/backend/json/balances/{2 => balance_2} (100%)
 rename k8s/envoy-x509/k8s/backend/json/profiles/{1 => profile_1} (100%)
 rename k8s/envoy-x509/k8s/backend/json/profiles/{2 => profile_2} (100%)
 rename k8s/envoy-x509/k8s/backend/json/transactions/{1 => transaction_1} (100%)
 rename k8s/envoy-x509/k8s/backend/json/transactions/{2 => transaction_2} (100%)

diff --git a/k8s/envoy-x509/k8s/backend/json/balances/1 b/k8s/envoy-x509/k8s/backend/json/balances/balance_1
similarity index 100%
rename from k8s/envoy-x509/k8s/backend/json/balances/1
rename to k8s/envoy-x509/k8s/backend/json/balances/balance_1
diff --git a/k8s/envoy-x509/k8s/backend/json/balances/2 b/k8s/envoy-x509/k8s/backend/json/balances/balance_2
similarity index 100%
rename from k8s/envoy-x509/k8s/backend/json/balances/2
rename to k8s/envoy-x509/k8s/backend/json/balances/balance_2
diff --git a/k8s/envoy-x509/k8s/backend/json/profiles/1 b/k8s/envoy-x509/k8s/backend/json/profiles/profile_1
similarity index 100%
rename from k8s/envoy-x509/k8s/backend/json/profiles/1
rename to k8s/envoy-x509/k8s/backend/json/profiles/profile_1
diff --git a/k8s/envoy-x509/k8s/backend/json/profiles/2 b/k8s/envoy-x509/k8s/backend/json/profiles/profile_2
similarity index 100%
rename from k8s/envoy-x509/k8s/backend/json/profiles/2
rename to k8s/envoy-x509/k8s/backend/json/profiles/profile_2
diff --git a/k8s/envoy-x509/k8s/backend/json/transactions/1 b/k8s/envoy-x509/k8s/backend/json/transactions/transaction_1
similarity index 100%
rename from k8s/envoy-x509/k8s/backend/json/transactions/1
rename to k8s/envoy-x509/k8s/backend/json/transactions/transaction_1
diff --git a/k8s/envoy-x509/k8s/backend/json/transactions/2 b/k8s/envoy-x509/k8s/backend/json/transactions/transaction_2
similarity index 100%
rename from k8s/envoy-x509/k8s/backend/json/transactions/2
rename to k8s/envoy-x509/k8s/backend/json/transactions/transaction_2
diff --git a/k8s/envoy-x509/k8s/frontend-2/config/symbank-webapp-2.conf b/k8s/envoy-x509/k8s/frontend-2/config/symbank-webapp-2.conf
index 2f49b45..811cc92 100644
--- a/k8s/envoy-x509/k8s/frontend-2/config/symbank-webapp-2.conf
+++ b/k8s/envoy-x509/k8s/frontend-2/config/symbank-webapp-2.conf
@@ -1,5 +1,5 @@
 port = 3002
 address = ""
-balanceDataPath = "http://localhost:3003/balances/2"
-profileDataPath = "http://localhost:3003/profiles/2"
-transactionDataPath = "http://localhost:3003/transactions/2"
+balanceDataPath = "http://localhost:3003/balances/balance_2"
+profileDataPath = "http://localhost:3003/profiles/profile_2"
+transactionDataPath = "http://localhost:3003/transactions/transaction_2"
diff --git a/k8s/envoy-x509/k8s/frontend/config/symbank-webapp.conf b/k8s/envoy-x509/k8s/frontend/config/symbank-webapp.conf
index 5c57dec..7815c84 100644
--- a/k8s/envoy-x509/k8s/frontend/config/symbank-webapp.conf
+++ b/k8s/envoy-x509/k8s/frontend/config/symbank-webapp.conf
@@ -1,5 +1,5 @@
 port = 3000
 address = ""
-balanceDataPath = "http://localhost:3001/balances/1"
-profileDataPath = "http://localhost:3001/profiles/1"
-transactionDataPath = "http://localhost:3001/transactions/1"
+balanceDataPath = "http://localhost:3001/balances/balance_1"
+profileDataPath = "http://localhost:3001/profiles/profile_1"
+transactionDataPath = "http://localhost:3001/transactions/transaction_1"
diff --git a/k8s/envoy-x509/k8s/kustomization.yaml b/k8s/envoy-x509/k8s/kustomization.yaml
index 5ae1d7b..bba7228 100644
--- a/k8s/envoy-x509/k8s/kustomization.yaml
+++ b/k8s/envoy-x509/k8s/kustomization.yaml
@@ -4,16 +4,16 @@ configMapGenerator:
     - backend/config/envoy.yaml
 - name: backend-balance-json-data
   files:
-    - backend/json/balances/1
-    - backend/json/balances/2
+    - backend/json/balances/balance_1
+    - backend/json/balances/balance_2
 - name: backend-profile-json-data
   files:
-    - backend/json/profiles/1
-    - backend/json/profiles/2
+    - backend/json/profiles/profile_1
+    - backend/json/profiles/profile_2
 - name: backend-transactions-json-data
   files:
-    - backend/json/transactions/1
-    - backend/json/transactions/2
+    - backend/json/transactions/transaction_1
+    - backend/json/transactions/transaction_2
 - name: frontend-envoy
   files:
     - frontend/config/envoy.yaml