fixing

demo/application_deploy_sidecar/python_deploy.yaml

@@ -32,7 +32,7 @@ spec:
 
           [VAULT]
           Enabled=True
-          DynamicDBCreds=false
+          DynamicDBCreds=True
           DynamicDBCredsPath=lob_a/workshop/database/creds/workshop-app
           Platform=kubernetes
           ProtectRecords=False

demo/consul/values.yaml

@@ -28,7 +28,7 @@ global:
   #   image: "consul:1.5.0"
   #   # Consul Enterprise 1.5.0
   #   image: "hashicorp/consul-enterprise:1.5.0-ent"
-  image: consul:1.9.0-beta1
+  image: consul:1.9.0
 
   # array of objects containing image pull secret names that will be applied to
   # each service account.
@@ -51,7 +51,7 @@ global:
   # If using acls.manageSystemACLs then must be >= 0.10.1.
   # If using connect inject then must be >= 0.10.1.
   # If using Consul Enterprise namespaces, must be >= 0.12.
-  imageK8S: "hashicorp/consul-k8s:0.19.0"
+  imageK8S: "hashicorp/consul-k8s:0.21.0"
 
   # datacenter is the name of the datacenter that the agents should register
   # as. This can't be changed once the Consul cluster is up and running

demo/full_stack_deploy.sh

@@ -32,10 +32,10 @@ sleep 5s
 kubectl apply -f ./application_deploy_sidecar
 kubectl get svc k8s-transit-app
 
-kubectl apply -f ./go_movies_app
-kubectl get svc go-movies-app
+# kubectl apply -f ./go_movies_app
+# kubectl get svc go-movies-app
 
-kubectl wait --timeout=180s --for=condition=Ready $(kubectl get pod --selector=app=go-movies-app -o name)
+# kubectl wait --timeout=180s --for=condition=Ready $(kubectl get pod --selector=app=go-movies-app -o name)
 
 consul config write consul/ingress.hcl
 consul config write consul/resolver.hcl

demo/go_movies_app/go_deploy_v1.yaml

@@ -1,9 +1,9 @@
 ---
-  apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: go-movies-app
-  automountServiceAccountToken: true
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: go-movies-app
+automountServiceAccountToken: true
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -30,7 +30,6 @@ spec:
         app: go-movies-app
         version: v1
     spec:
-      #fix: go-movies-app
       serviceAccountName: vault-auth
       automountServiceAccountToken: true
       containers:

demo/go_movies_app/go_deploy_v2.yaml

@@ -1,3 +1,10 @@
+# ---
+# apiVersion: v1
+# kind: ServiceAccount
+# metadata:
+#     name: go-movies-app-v2
+# automountServiceAccountToken: true
+# ---
 # apiVersion: apps/v1
 # kind: Deployment
 # metadata:
@@ -16,14 +23,13 @@
 #       annotations:
 #         consul.hashicorp.com/connect-inject: "true"
 #         consul.hashicorp.com/connect-service-protocol: "http"
-#         "consul.hashicorp.com/service-tags": "v2"
-#         consul.hashicorp.com/connect-service-upstreams: "vault:8200, pq-postgresql:5432, go-movies-favorites-app:8081"
+#         consul.hashicorp.com/service-tags: "v2"
+#         consul.hashicorp.com/connect-service-upstreams: " go-movies-favorites-app:8081, vault:8200, pq-postgresql:5432"
 #       name: go-movies-app
 #       labels:
 #         app: go-movies-app
 #         version: v2
 #     spec:
-#       #fix: go-movies-app
 #       serviceAccountName: vault-auth
 #       automountServiceAccountToken: true
 #       containers:

demo/mariadb/mariadb.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-
-helm install mariadb -f ./values.yaml stable/mariadb
+helm repo add bitnami https://charts.bitnami.com/bitnami
+helm install mariadb -f ./new.values.yaml bitnami/mariadb