build auction image

TryCatchLearn · Aug 21, 2024 · 36f48ca · 36f48ca
1 parent 5574db1
commit 36f48ca
Show file tree

Hide file tree

Showing 12 changed files with 192 additions and 18 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,36 @@
+name: Build and publish
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        service:
+          - name: 'trycatchlearn/auction-svc'
+            path: 'src/AuctionService'
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Docker buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to Docker
+      uses: docker/login-action@v3
+      with:
+        username: ${{secrets.DOCKER_USERNAME}}
+        password: ${{secrets.DOCKER_TOKEN}}
+
+    - name: Build and push docker image
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        file: ${{matrix.service.path}}/Dockerfile
+        push: true
+        tags: ${{matrix.service.name}}:latest
diff --git a/infra/K8S/auction-depl.yml b/infra/K8S/auction-depl.yml
@@ -15,6 +15,22 @@ spec:
       - name: auction-svc
         image: trycatchlearn/auction-svc
         imagePullPolicy: Never
+        env:
+          - name: ConnectionStrings__DefaultConnection
+            valueFrom:
+              secretKeyRef:
+                name: auction-secret
+                key: connString
+          - name: RabbitMQ__Username
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: username
+          - name: RabbitMQ__Password
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: password
         envFrom:
           - configMapRef:
               name: auction-svc-config

diff --git a/infra/K8S/bid-depl.yml b/infra/K8S/bid-depl.yml
@@ -15,6 +15,22 @@ spec:
       - name: bid-svc
         image: trycatchlearn/bid-svc
         imagePullPolicy: Never
+        env:
+          - name: ConnectionStrings__BidDbConnection
+            valueFrom:
+              secretKeyRef:
+                name: bid-secret
+                key: connString
+          - name: RabbitMQ__Username
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: username
+          - name: RabbitMQ__Password
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: password
         envFrom:
           - configMapRef:
               name: bid-svc-config

diff --git a/infra/K8S/config.yml b/infra/K8S/config.yml
@@ -5,9 +5,6 @@ metadata:
 data:
   ASPNETCORE_URLS: http://+:80;http://+:7777
   RabbitMQ__Host: rabbit-clusterip
-  RabbitMQ__Username: rabbit
-  RabbitMQ__Password: rabbitpw
-  ConnectionStrings__DefaultConnection: Server=postgres-clusterip;User Id=postgres;Password=postgrespw;Database=auctions
   IdentityServiceUrl: http://identity-clusterip
   Kestrel__Endpoints__Grpc__Protocols: Http2
   Kestrel__Endpoints__Grpc__Url: http://+:7777
@@ -21,9 +18,6 @@ metadata:
 data:
   ASPNETCORE_URLS: http://+:80
   RabbitMQ__Host: rabbit-clusterip
-  RabbitMQ__Username: rabbit
-  RabbitMQ__Password: rabbitpw
-  ConnectionStrings__MongoDbConnection: mongodb://root:mongopw@mongo-clusterip
   AuctionServiceUrl: http://auction-clusterip
 ---
 apiVersion: v1
@@ -33,9 +27,6 @@ metadata:
 data:
   ASPNETCORE_URLS: http://+:80
   RabbitMQ__Host: rabbit-clusterip
-  RabbitMQ__Username: rabbit
-  RabbitMQ__Password: rabbitpw
-  ConnectionStrings__BidDbConnection: mongodb://root:mongopw@mongo-clusterip
   IdentityServiceUrl: http://identity-clusterip
   GrpcAuction: http://auction-clusterip:7777
 ---
@@ -46,8 +37,6 @@ metadata:
 data:
   ASPNETCORE_URLS: http://+:80
   RabbitMQ__Host: rabbit-clusterip
-  RabbitMQ__Username: rabbit
-  RabbitMQ__Password: rabbitpw
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -66,14 +55,12 @@ data:
   ASPNETCORE_URLS: http://+:80
   IssuerUri: https://id.carsties.local
   ClientApp: https://app.carsties.local
-  ConnectionStrings__DefaultConnection: Server=postgres-clusterip; User Id=postgres; Password=postgrespw; Database=identity
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: webapp-svc-config
 data:
-  AUTH_SECRET: 7vgUxWjehgeKTOFH2dZu0zSeKP61o9gl0b1vuHCqeMo=
   AUTH_URL: https://app.carsties.local
   AUTH_URL_INTERNAL: http://webapp-clusterip:3000
   API_URL: http://gateway-clusterip/

diff --git a/infra/K8S/identity-depl.yml b/infra/K8S/identity-depl.yml
@@ -15,6 +15,12 @@ spec:
       - name: identity-svc
         image: trycatchlearn/identity-svc
         imagePullPolicy: Never
+        env:
+          - name: ConnectionStrings__DefaultConnection
+            valueFrom:
+              secretKeyRef:
+                name: identity-secret
+                key: connString
         envFrom:
           - configMapRef:
               name: identity-svc-config

diff --git a/infra/K8S/mongo-depl.yml b/infra/K8S/mongo-depl.yml
@@ -16,9 +16,15 @@ spec:
         image: mongo
         env:
           - name: MONGO_INITDB_ROOT_USERNAME
-            value: root
+            valueFrom:
+              secretKeyRef:
+                name: mongo-secret
+                key: username
           - name: MONGO_INITDB_ROOT_PASSWORD
-            value: mongopw
+            valueFrom:
+              secretKeyRef:
+                name: mongo-secret
+                key: password
         ports:
         - containerPort: 27017
         volumeMounts:

diff --git a/infra/K8S/notify-depl.yml b/infra/K8S/notify-depl.yml
@@ -15,6 +15,17 @@ spec:
       - name: notify-svc
         image: trycatchlearn/notify-svc
         imagePullPolicy: Never
+        env:
+          - name: RabbitMQ__Username
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: username
+          - name: RabbitMQ__Password
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: password
         envFrom:
           - configMapRef:
               name: notify-svc-config

diff --git a/infra/K8S/postgres-depl.yml b/infra/K8S/postgres-depl.yml
@@ -16,7 +16,10 @@ spec:
         image: postgres
         env:
           - name: POSTGRES_PASSWORD
-            value: postgrespw
+            valueFrom:
+              secretKeyRef:
+                name: postgres-secret
+                key: password
         ports:
         - containerPort: 5432
         volumeMounts:

diff --git a/infra/K8S/rabbit-depl.yml b/infra/K8S/rabbit-depl.yml
@@ -16,9 +16,15 @@ spec:
         image: rabbitmq:3-management
         env:
           - name: RABBITMQ_DEFAULT_USER
-            value: rabbit
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: username
           - name: RABBITMQ_DEFAULT_PASS
-            value: rabbitpw
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: password
         ports:
         - containerPort: 15672
           name: rbmq-mgmt-port

diff --git a/infra/K8S/search-depl.yml b/infra/K8S/search-depl.yml
@@ -15,6 +15,22 @@ spec:
       - name: search-svc
         image: trycatchlearn/search-svc
         imagePullPolicy: Never
+        env:
+          - name: ConnectionStrings__MongoDbConnection
+            valueFrom:
+              secretKeyRef:
+                name: search-secret
+                key: connString
+          - name: RabbitMQ__Username
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: username
+          - name: RabbitMQ__Password
+            valueFrom:
+              secretKeyRef:
+                name: rabbit-secret
+                key: password
         envFrom:
           - configMapRef:
               name: search-svc-config

diff --git a/infra/K8S/webapp-depl.yml b/infra/K8S/webapp-depl.yml
@@ -15,6 +15,12 @@ spec:
       - name: webapp-svc
         image: trycatchlearn/web-app
         imagePullPolicy: Never
+        env:
+          - name: AUTH_SECRET
+            valueFrom:
+              secretKeyRef:
+                name: webapp-secret
+                key: authSecret
         envFrom:
           - configMapRef:
               name: webapp-svc-config

diff --git a/infra/dev-k8s/dev-secrets.yml b/infra/dev-k8s/dev-secrets.yml
@@ -0,0 +1,65 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: postgres-secret
+type: Opaque
+stringData:
+  password: postgresSecretPw
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: auction-secret
+type: Opaque
+stringData:
+  connString: 'Server=postgres-clusterip:5432;User Id=postgres;Password=postgresSecretPw;Database=auctions'
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mongo-secret
+type: Opaque
+stringData:
+  username: mongoUn
+  password: mongoSecretPw
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: rabbit-secret
+type: Opaque
+stringData:
+  username: rabbitUn
+  password: rabbitSecretPw
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: search-secret
+type: Opaque
+stringData:
+  connString: mongodb://mongoUn:mongoSecretPw@mongo-clusterip
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: webapp-secret
+type: Opaque
+stringData:
+  authSecret: thisisevenmoresecretthanprevioussecrets
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: bid-secret
+type: Opaque
+stringData:
+  connString: 'mongodb://mongoUn:mongoSecretPw@mongo-clusterip'
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: identity-secret
+type: Opaque
+stringData:
+  connString: 'Server=postgres-clusterip:5432;User Id=postgres;Password=postgresSecretPw;Database=identity'