added secrets for myaktion-db

helm-msa/templates/deployment/myaktion-postgres-db-deployment.yaml → helm-msa/templates/deployment/myaktion-db-deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: myaktion-postgres-db
+  name: myaktion-db
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: myaktion-postgres-db
+      app: myaktion-db
   template:
     metadata:
       annotations:
         linkerd.io/inject: enabled
       labels:
-        app: myaktion-postgres-db
+        app: myaktion-db
     spec:
       containers:
-      - name: myaktion-postgres-db
+      - name: myaktion-db
         image: postgres:14.5
         imagePullPolicy: IfNotPresent
         ports:
@@ -24,17 +24,17 @@ spec:
         - name: POSTGRES_USER
           valueFrom:
             secretKeyRef:
-              name: user-db-secret
+              name: myaktion-db-secret
               key: DATABASE_USER
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: user-db-secret
+              name: usmyaktioner-db-secret
               key: DATABASE_PASSWORD
         volumeMounts:
         - mountPath: /var/lib/postgresql/data
-          name: myaktion-postgres-db-pv-claim
+          name: myaktion-db-pv-claim
       volumes:
-      - name: myaktion-postgres-db-pv-claim
+      - name: myaktion-db-pv-claim
         persistentVolumeClaim:
-          claimName: myaktion-postgres-db-pv-claim
\ No newline at end of file
+          claimName: myaktion-db-pv-claim
\ No newline at end of file

helm-msa/templates/deployment/myaktion-deployment.yaml

@@ -27,3 +27,13 @@ spec:
           value: "http://myaktion-monitor-service/donations"
         - name: SPRING_REDIS_HOST
           value: "redis-service"
+        - name: SPRING_DATASOURCE_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: user-db-secret
+              key: DATABASE_USER
+        - name: SPRING_DATASOURCE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: user-db-secret
+              key: DATABASE_PASSWORD

helm-msa/templates/persistent_volume/myaktion-postgres-db-storage.yml → helm-msa/templates/persistent_volume/myaktion-db-storage.yml

 kind: PersistentVolume
 apiVersion: v1
 metadata:
-  name: myaktion-postgres-db-pv
+  name: myaktion-db-pv
   labels:
     type: local
 spec:
@@ -17,8 +17,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   labels:
-    app: myaktion-postgres-db
-  name: myaktion-postgres-db-pv-claim
+    app: myaktion-db
+  name: myaktion-db-pv-claim
 spec:
   storageClassName: standard
   accessModes:

helm-msa/templates/secret/myaktion-db-secret.yml

+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: myaktion-db-secret
+data:
+  DATABASE_USER: dXNlcjE=
+  DATABASE_PASSWORD: cGFzc3dvcmQx
\ No newline at end of file

helm-msa/templates/service_profile/server-test-service-profile.yml → helm-msa/templates/service_profile/myaktion-service-profile.yml

@@ -2,7 +2,7 @@ apiVersion: linkerd.io/v1alpha2
 kind: ServiceProfile
 metadata:
   creationTimestamp: null
-  name: server-test-service-profile
+  name: myaktion-service-profile
   namespace: default
 spec:
   routes: