vietnam-devs#9 corect config for MySQL and update readme

MuratGundes · Aug 26, 2018 · ee318d8 · ee318d8
1 parent 1231094
commit ee318d8
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 108 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,12 @@ CoolStore is a containerised polyglot microservices application consisting of se
 
 It demonstrates how to wire up small microservices into a larger application using microservice architectural principals.
 
+### Screenshots
+
+| Home Page | Product Page |
+|-----------|--------------|
+| [![home-page](assets/images/ui-screen-1.PNG?raw=true)](assets/images/ui-screen-1.PNG?raw=true) | [![product-page](assets/images/ui-screen-2.PNG?raw=true)](assets/images/ui-screen-2.PNG?raw=true) |
+
 ### Presentation
 Our team uses this application to demonstrate Kubernetes, AKS, Istio and similar cloud-native technologies in events as following
 

diff --git a/assets/images/arch-diagram.png b/assets/images/arch-diagram.png
diff --git a/assets/images/ui-screen-1.PNG b/assets/images/ui-screen-1.PNG
diff --git a/assets/images/ui-screen-2.PNG b/assets/images/ui-screen-2.PNG
diff --git a/assets/state-of-the-art.pptx b/assets/state-of-the-art.pptx
diff --git a/deploys/charts/coolstore/templates/cart-db-dep.yaml b/deploys/charts/coolstore/templates/cart-db-dep.yaml
@@ -18,20 +18,6 @@ spec:
         env:
         - name: MYSQL_ROOT_PASSWORD
           value: "P@ssw0rd"
-        - name: MYSQL_ALLOW_EMPTY_PASSWORD 
-          value: false
-        - name: MYSQL_RANDOM_ROOT_PASSWORD
-          value: false
-        - name: DB_TYPE
-          value: "mysql"
-        - name: MYSQL_DB_HOST
-          value: "maindb"
-        - name: MYSQL_DB_PORT
-          value: "3306"
-        - name: MYSQL_DB_USER
-          value: "root"
-        - name: MYSQL_DB_PASSWORD
-          value: "P@ssw0rd"
         ports:
         - containerPort: 3306
 ---
diff --git a/deploys/charts/coolstore/templates/inventory-db-dep.yaml b/deploys/charts/coolstore/templates/inventory-db-dep.yaml
@@ -18,20 +18,6 @@ spec:
         env:
         - name: MYSQL_ROOT_PASSWORD
           value: "P@ssw0rd"
-        - name: MYSQL_ALLOW_EMPTY_PASSWORD 
-          value: false
-        - name: MYSQL_RANDOM_ROOT_PASSWORD
-          value: false
-        - name: DB_TYPE
-          value: "mysql"
-        - name: MYSQL_DB_HOST
-          value: "maindb"
-        - name: MYSQL_DB_PORT
-          value: "3306"
-        - name: MYSQL_DB_USER
-          value: "root"
-        - name: MYSQL_DB_PASSWORD
-          value: "P@ssw0rd"
         ports:
         - containerPort: 3306
 ---
diff --git a/deploys/charts/coolstore/templates/review-db-dep.yaml b/deploys/charts/coolstore/templates/review-db-dep.yaml
@@ -18,20 +18,6 @@ spec:
         env:
         - name: MYSQL_ROOT_PASSWORD
           value: "P@ssw0rd"
-        - name: MYSQL_ALLOW_EMPTY_PASSWORD 
-          value: false
-        - name: MYSQL_RANDOM_ROOT_PASSWORD
-          value: false
-        - name: DB_TYPE
-          value: "mysql"
-        - name: MYSQL_DB_HOST
-          value: "maindb"
-        - name: MYSQL_DB_PORT
-          value: "3306"
-        - name: MYSQL_DB_USER
-          value: "root"
-        - name: MYSQL_DB_PASSWORD
-          value: "P@ssw0rd"
         ports:
         - containerPort: 3306
 ---
diff --git a/src/services/cart/appsettings.json b/src/services/cart/appsettings.json
@@ -12,15 +12,15 @@
   },
   "k8s": {
     "mssqldb": {
-      "Host": "CART_DB_SERVICE_HOST",
-      "Port": "CART_DB_SERVICE_PORT",
+      "Host": "CARTDB_SERVICE_HOST",
+      "Port": "CARTDB_SERVICE_PORT",
       "Database": "maindb",
       "UserName": "cs",
       "Password": "P@ssw0rd"
     },
     "mysqldb": {
-      "Host": "CART_DB_SERVICE_HOST",
-      "Port": "CART_DB_SERVICE_PORT",
+      "Host": "CARTDB_SERVICE_HOST",
+      "Port": "CARTDB_SERVICE_PORT",
       "Database": "maindb",
       "UserName": "root",
       "Password": "P@ssw0rd",