Finishing touch with postgres

MadWorldNL · Aug 23, 2024 · d4c3d3a · d4c3d3a
1 parent 445e1e3
commit d4c3d3a
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 16 deletions.
diff --git a/deployment/MantaRayPlanCloud/environments/values-production.yaml b/deployment/MantaRayPlanCloud/environments/values-production.yaml
@@ -1,7 +1,7 @@
 namespace: "manta-ray-plan-production"
 
 image:
-  tag: "v0.4.6"
+  tag: "v0.4.7"
 
 clusterIssuer:
   enabled: true
@@ -30,6 +30,7 @@ logging:
     firstTimePassword: "QFCKH3NTSBQ5zmsH9DpXTB2YefIavEGJKa4SshKb11AXX8b4o4KPjuo9bd6WBfqDkpxKqzNjaOrCsE49ph369Wx84mIrksnJx5OtRcxAOjff"
 
 database:
+  enabled: true
   size:
     single: 10Gi
     combined: 35Gi

diff --git a/deployment/MantaRayPlanCloud/templates/api-grpc.yaml b/deployment/MantaRayPlanCloud/templates/api-grpc.yaml
@@ -31,6 +31,22 @@ spec:
             timeoutSeconds: 1
             failureThreshold: 3 
           env:
+            - name: Database__Host
+              value: "postgres-ro"
+            - name: Database__Port
+              value: "5432"
+            - name: Database__DbName
+              value: "MantaRayPlan"
+            - name: Database__User
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.database.secret.name }}
+                  key: username
+            - name: Database__Password
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.database.secret.name }}
+                  key: password      
             - name: OpenTelemetry__LoggerEndpoint
               value: "{{ .Values.logging.seq.host.internal }}"
             - name: OpenTelemetry__LoggerApiKey

diff --git a/deployment/MantaRayPlanCloud/templates/api-message-bus.yaml b/deployment/MantaRayPlanCloud/templates/api-message-bus.yaml
@@ -31,6 +31,22 @@ spec:
             timeoutSeconds: 1
             failureThreshold: 3
           env:
+            - name: Database__Host
+              value: "postgres-rw"
+            - name: Database__Port
+              value: "5432"
+            - name: Database__DbName
+              value: "MantaRayPlan"
+            - name: Database__User
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.database.secret.name }}
+                  key: username
+            - name: Database__Password
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.database.secret.name }}
+                  key: password  
             - name: OpenTelemetry__LoggerEndpoint
               value: "{{ .Values.logging.seq.host.internal }}"
             - name: OpenTelemetry__LoggerApiKey

diff --git a/deployment/MantaRayPlanCloud/templates/postgres.yaml b/deployment/MantaRayPlanCloud/templates/postgres.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: postgres-secret
+  name: {{ .Values.database.secret.name }}
   namespace: {{ .Values.namespace }}
 type: kubernetes.io/basic-auth
 data:

diff --git a/deployment/MantaRayPlanCloud/values.yaml b/deployment/MantaRayPlanCloud/values.yaml
@@ -85,6 +85,8 @@ database:
   size:
     single: 1Gi
     combined: 4Gi
+  secret:
+    name: postgres-secret
 
 pgadmin:
   outsideAccess: 

diff --git a/docs/kubernetes.md b/docs/kubernetes.md
@@ -75,7 +75,7 @@ helm install -f environments/values-development.yaml manta-ray-plan-cloud .
 
 Upgrade the cluster when you have a new version:
 ```shell
-helm upgrade -f environments/values-development.yaml manta-ray-plan-cloud .
+    helm upgrade -f environments/values-development.yaml manta-ray-plan-cloud .
 ```
 
 Remove the cluster from Kubernetes:

diff --git a/src/Server.DataAccess.DataBase/MessageBuses/MessageBusRepository.cs b/src/Server.DataAccess.DataBase/MessageBuses/MessageBusRepository.cs
@@ -2,35 +2,28 @@
 
 namespace MadWorldNL.MantaRayPlan.MessageBuses;
 
-public class MessageBusRepository : IMessageBusRepository
+public class MessageBusRepository(MantaRayPlanDbContext dbContext) : IMessageBusRepository
 {
-    private readonly MantaRayPlanDbContext _dbContext;
-
-    public MessageBusRepository(MantaRayPlanDbContext dbContext)
-    {
-        _dbContext = dbContext;
-    }
-
     public async Task CreateAsync(MessageBusStatus status)
     {
-        await _dbContext.MessageBusStatus
+        await dbContext.MessageBusStatus
                 .AddAsync(status);
 
-        await _dbContext.SaveChangesAsync();
+        await dbContext.SaveChangesAsync();
     }
 
     public async Task<MessageBusStatus?> FindStatusAsync()
     {
-        return await _dbContext.MessageBusStatus
+        return await dbContext.MessageBusStatus
                 .OrderBy(s => s.Id)
                 .LastOrDefaultAsync();
     }
 
     public async Task UpdateAsync(MessageBusStatus status)
     {
-        _dbContext.MessageBusStatus
+        dbContext.MessageBusStatus
             .Update(status);
 
-        await _dbContext.SaveChangesAsync();
+        await dbContext.SaveChangesAsync();
     }
 }