Feature: Add message bus

.github/workflows/sonarqube.yaml

@@ -8,8 +8,13 @@ on:
 jobs:
   build:
     name: Build and analyze
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
+      - name: Set up Docker
+        run: |
+          docker version
+          docker pull postgres:16 --platform=linux/amd64
+          docker pull rabbitmq:3.11 --platform=linux/amd64
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
@@ -18,34 +23,33 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-      - name: Cache SonarCloud scanner
-        id: cache-sonar-scanner
+      - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
-          path: .\.sonar\scanner
-          key: ${{ runner.os }}-sonar-scanner
-          restore-keys: ${{ runner.os }}-sonar-scanner
+          path: ~\sonar\cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
       - name: Install SonarCloud scanner
         if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
-        shell: powershell
         run: |
-          New-Item -Path .\.sonar\scanner -ItemType Directory
-          dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+          dotnet tool install --global dotnet-sonarscanner
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        shell: powershell
         run: |
-          .\.sonar\scanner\dotnet-sonarscanner begin /k:"MadWorldNL_MantaRayPlan" /o:"madworldnl" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"  /d:sonar.cs.opencover.reportsPaths=TestResults/*/coverage.opencover.xml /d:sonar.coverage.exclusions="**Test*.cs"  /d:sonar.exclusions="**/Clients.DefaultStyle/wwwroot/lib/**, **/Clients.DefaultStyle/wwwroot/app/**"
+          dotnet-sonarscanner begin /k:"MadWorldNL_MantaRayPlan" /o:"madworldnl" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"  /d:sonar.cs.opencover.reportsPaths=TestResults/*/coverage.opencover.xml /d:sonar.coverage.exclusions="**Test*.cs"  /d:sonar.exclusions="**/Clients.DefaultStyle/wwwroot/lib/**, **/Clients.DefaultStyle/wwwroot/app/**"
+          dotnet workload install android
           dotnet workload restore ./src/MadWorldNL.MantaRayPlan.sln; 
           dotnet restore ./src/MadWorldNL.MantaRayPlan.sln; 
           dotnet build ./src/MadWorldNL.MantaRayPlan.sln --no-restore -c Release;
           dotnet test ./src/MadWorldNL.MantaRayPlan.sln --no-build --no-restore -c Release --blame-hang-timeout 5min --collect:"XPlat Code Coverage" --results-directory TestResults/ -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover;
-          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
+          dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

README.md

@@ -45,7 +45,8 @@ docker compose up
 
 *This project is required to set as startup project
 
-`dotnet workload restore` is required to install the necessary workloads for the project. You don't need to run this command if you have already installed the workloads.
+`dotnet workload restore` is required to install the necessary workloads for the project. However, when you download a new update,
+it may be necessary to run this command to ensure all workloads are up to date.
 
 ### Running the tests
 Before running the tests, ensure Docker is up and running.

deployment/MantaRayPlanCloud/environments/values-production.yaml

@@ -1,7 +1,7 @@
 namespace: "manta-ray-plan-production"
 
 image:
-  tag: "v0.4.7"
+  tag: "v0.5.0"
 
 clusterIssuer:
   enabled: true

deployment/MantaRayPlanCloud/templates/admin-bff.yaml

@@ -18,10 +18,21 @@ spec:
         app: {{ .Values.admin.bff.app }}
         task: {{ .Values.admin.bff.name }}
     spec:
+      serviceAccountName: {{ .Values.serveraccount.name }}
+      automountServiceAccountToken: false
       containers:
         - name: {{ .Values.admin.bff.app }}
           image: "{{ .Values.admin.bff.image }}:{{ .Values.image.tag }}"
           imagePullPolicy: Always
+          resources:
+            requests:
+              ephemeral-storage: "1Gi"
+              cpu: 0.5
+              memory: "500Mi"
+            limits:
+              ephemeral-storage: "2Gi"
+              cpu: 1
+              memory: "1Gi"
           livenessProbe:
             httpGet:
               path: /healthz
@@ -31,13 +42,27 @@ spec:
             timeoutSeconds: 1
             failureThreshold: 3
           env:
+            - name: Api__Address
+              value: "{{ .Values.api.grpc.loadBalancer }}:8080"
             - name: OpenTelemetry__LoggerEndpoint
               value: "{{ .Values.logging.seq.host.internal }}"
             - name: OpenTelemetry__LoggerApiKey
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.logging.seq.secrets.name }}
-                  key: apiKeyAdmin 
+                  key: apiKeyAdmin
+            - name: MessageBus__Host
+              value: {{ .Values.messageBus.loadBalancer }}
+            - name: MessageBus__Username
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.messageBus.secret.name }}
+                  key: username
+            - name: MessageBus__Password
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.messageBus.secret.name }}
+                  key: password  
           ports:
             - containerPort: 8080
 ---

deployment/MantaRayPlanCloud/templates/admin-web.yaml

@@ -6,18 +6,13 @@ metadata:
 data:
   default.conf: |
     server {
-        listen       80;
+        listen 80;
         listen  [::]:80;
         server_name  localhost;
 
         location / {
-            root   /usr/share/nginx/html;
-            index  index.html index.htm;
-        }
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   /usr/share/nginx/html;
+            root      /usr/share/nginx/html;
+            try_files $uri $uri/ /index.html =404;
         }
 
         add_header X-Frame-Options "DENY" always;
@@ -27,6 +22,19 @@ data:
         add_header content-security-policy "default-src 'self' https://{{ .Values.admin.bff.host }}; img-src 'self' data: ; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self' https://{{ .Values.admin.bff.host }}; upgrade-insecure-requests; frame-ancestors 'self'";
      }
 ---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Values.admin.web.app }}-appsetting-config"
+  namespace: {{ .Values.namespace }}
+data:
+  default.conf: |
+    {
+        "Api": {
+          "Address": "https://{{ .Values.admin.bff.host }}/"
+        }
+    }
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -47,10 +55,21 @@ spec:
         app: {{ .Values.admin.web.app }}
         task: {{ .Values.admin.web.name }}
     spec:
+      serviceAccountName: {{ .Values.serveraccount.name }}
+      automountServiceAccountToken: false
       containers:
         - name: {{ .Values.admin.web.app }}
           image: "{{ .Values.admin.web.image }}:{{ .Values.image.tag }}"
           imagePullPolicy: Always
+          resources:
+            requests:
+              ephemeral-storage: "1Gi"
+              cpu: 0.5
+              memory: "500Mi"
+            limits:
+              ephemeral-storage: "2Gi"
+              cpu: 1
+              memory: "1Gi"
           livenessProbe:
             httpGet:
               path: /healthz.txt
@@ -64,12 +83,19 @@ spec:
               mountPath: /etc/nginx/conf.d/default.conf
               subPath: default.conf
               readOnly: true
+            - name: "{{ .Values.admin.web.app }}-appsettings-config-volume"
+              mountPath: /usr/share/nginx/html/appsettings.json
+              subPath: appsettings.json
+              readOnly: true
           ports:
             - containerPort: 80
       volumes:
         - name: "{{ .Values.admin.web.app }}-nginx-config-volume"
           configMap:
             name: "{{ .Values.admin.web.app }}-nginx-config"
+        - name: "{{ .Values.admin.web.app }}-appsettings-config-volume"
+          configMap:
+            name: "{{ .Values.admin.web.app }}-appsettings-config"
 ---
 apiVersion: v1
 kind: Service

deployment/MantaRayPlanCloud/templates/api-grpc.yaml

@@ -18,10 +18,21 @@ spec:
         app: {{ .Values.api.grpc.app }}
         task: {{ .Values.api.grpc.name }}
     spec:
+      serviceAccountName: {{ .Values.serveraccount.name }}
+      automountServiceAccountToken: false
       containers:
         - name: {{ .Values.api.grpc.app }}
           image: "{{ .Values.api.grpc.image }}:{{ .Values.image.tag }}"
           imagePullPolicy: Always
+          resources:
+            requests:
+              ephemeral-storage: "1Gi"
+              cpu: 0.5
+              memory: "500Mi"
+            limits:
+              ephemeral-storage: "2Gi"
+              cpu: 1
+              memory: "1Gi"
           livenessProbe:
             httpGet:
               path: /healthz
@@ -55,7 +66,19 @@ spec:
                   name: {{ .Values.logging.seq.secrets.name }}
                   key: apiKeyGrpc
             - name: Kestrel__EndpointDefaults__Protocols
-              value: "Http1AndHttp2"       
+              value: "Http1AndHttp2"
+            - name: MessageBus__Host
+              value: {{ .Values.messageBus.loadBalancer }}
+            - name: MessageBus__Username
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.messageBus.secret.name }}
+                  key: username
+            - name: MessageBus__Password
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.messageBus.secret.name }}
+                  key: password        
           ports:
             - containerPort: 8080
 ---

deployment/MantaRayPlanCloud/templates/api-message-bus.yaml

@@ -18,10 +18,21 @@ spec:
         app: {{ .Values.api.messageBus.app }}
         task: {{ .Values.api.messageBus.name }}
     spec:
+      serviceAccountName: {{ .Values.serveraccount.name }}
+      automountServiceAccountToken: false
       containers:
         - name: {{ .Values.api.messageBus.app }}
           image: "{{ .Values.api.messageBus.image }}:{{ .Values.image.tag }}"
           imagePullPolicy: Always
+          resources:
+            requests:
+              ephemeral-storage: "1Gi"
+              cpu: 0.5
+              memory: "500Mi"
+            limits:
+              ephemeral-storage: "2Gi"
+              cpu: 1
+              memory: "1Gi"
           livenessProbe:
             httpGet:
               path: /healthz
@@ -56,5 +67,17 @@ spec:
                   key: apiKeyMessageBus     
             - name: Kestrel__EndpointDefaults__Protocols
               value: "Http1AndHttp2"
+            - name: MessageBus__Host
+              value: {{ .Values.messageBus.loadBalancer }}
+            - name: MessageBus__Username
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.messageBus.secret.name }}
+                  key: username
+            - name: MessageBus__Password
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.messageBus.secret.name }}
+                  key: password  
           ports:
             - containerPort: 8080