Merge pull request #43 from KNPhilip/deployment

Deployment
KNPhilip · Feb 23, 2024 · 2f1cec4 · 2f1cec4
2 parents 9227311 + 803b9d9
commit 2f1cec4
Show file tree

Hide file tree

Showing 12 changed files with 119 additions and 12 deletions.
diff --git a/.github/workflows/deploy-identity.yml b/.github/workflows/deploy-identity.yml
@@ -0,0 +1,23 @@
+name: Deploy Identity Service
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - 'src/IdentityService/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the code
+      uses: actions/checkout@v3
+    - name: Build and push the Docker image
+      uses: knphilip/actions/dockerfile-push@main
+      with:
+        tags: knphilip/bidwheels-identity-svc:latest
+        file: src/IdentityService/Dockerfile
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/K8S/local-pvc.yml b/K8S/local-pvc.yml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: postgres-claim
+spec:
+  resources:
+    requests:
+      storage: 200Mi
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
diff --git a/K8S/postgres-depl.yml b/K8S/postgres-depl.yml
@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: postgres
+spec:
+  selector:
+    matchLabels:
+      app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      containers:
+      - name: postgres
+        image: postgres
+        env:
+          - name: POSTGRES_PASSWORD
+            value: postgrespw
+        ports:
+        - containerPort: 5432
+        volumeMounts:
+        - mountPath: /var/data/postgresql
+          name: postgresdata
+      volumes:
+        - name: postgresdata
+          persistentVolumeClaim:
+            claimName: postgres-claim
diff --git a/src/AuctionService/AuctionService.csproj b/src/AuctionService/AuctionService.csproj
@@ -17,6 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
+    <PackageReference Include="Polly" Version="8.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AuctionService/Program.cs b/src/AuctionService/Program.cs
@@ -5,6 +5,9 @@
 using MassTransit;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
+using Npgsql;
+using Polly;
+using Polly.Retry;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
@@ -37,6 +40,11 @@
 
     config.UsingRabbitMq((context, cfg) => 
     {
+        cfg.UseMessageRetry(r => {
+            r.Handle<RabbitMqConnectionException>();
+            r.Interval(5, TimeSpan.FromSeconds(10));
+        });
+
         cfg.Host(builder.Configuration["RabbitMQ:Host"], "/", host => 
         {
             host.Username(builder.Configuration.GetValue("RabbitMQ:Username", "guest"));
@@ -65,6 +73,12 @@
 
 app.MapGrpcService<GrpcAuctionService>();
 
+RetryPolicy retryPolicy = Policy
+    .Handle<NpgsqlException>()
+    .WaitAndRetry(5, retryAttempt => TimeSpan.FromSeconds(10));
+
+retryPolicy.ExecuteAndCapture(() => DbInitializer.InitDb(app));
+
 try 
 {
     DbInitializer.InitDb(app);

diff --git a/src/BiddingService/BiddingService.csproj b/src/BiddingService/BiddingService.csproj
@@ -18,6 +18,7 @@
     <PackageReference Include="MassTransit.RabbitMQ" Version="8.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
     <PackageReference Include="MongoDB.Entities" Version="23.0.1" />
+    <PackageReference Include="Polly" Version="8.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BiddingService/Program.cs b/src/BiddingService/Program.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using BiddingService.Consumers;
 using BiddingService.Services;
+using Polly;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
@@ -16,6 +17,12 @@
 
     config.UsingRabbitMq((context, cfg) => 
     {
+        cfg.UseMessageRetry(r =>
+        {
+            r.Handle<RabbitMqConnectionException>();
+            r.Interval(5, TimeSpan.FromSeconds(10));
+        });
+
         cfg.Host(builder.Configuration["RabbitMQ:Host"], "/", host => 
         {
             host.Username(builder.Configuration.GetValue("RabbitMQ:Username", "guest"));
@@ -46,7 +53,12 @@
 
 app.MapControllers();
 
-await DB.InitAsync("BidDb", MongoClientSettings
-    .FromConnectionString(builder.Configuration.GetConnectionString("BidDbConnection")));
+await Policy.Handle<TimeoutException>()
+    .WaitAndRetryAsync(5, retryAttempt => TimeSpan.FromSeconds(10))
+    .ExecuteAndCaptureAsync(async () => 
+    {
+        await DB.InitAsync("BidDb", MongoClientSettings
+            .FromConnectionString(builder.Configuration.GetConnectionString("BidDbConnection")));
+    });
 
 app.Run();
diff --git a/src/IdentityService/IdentityService.csproj b/src/IdentityService/IdentityService.csproj
@@ -11,6 +11,8 @@
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.1" />
 
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
+
+		<PackageReference Include="Polly" Version="8.3.0" />
 		<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
 
 		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.1" />

diff --git a/src/IdentityService/Program.cs b/src/IdentityService/Program.cs
@@ -1,4 +1,7 @@
 using IdentityService;
+using Npgsql;
+using Polly;
+using Polly.Retry;
 using Serilog;
 
 Log.Logger = new LoggerConfiguration()
@@ -22,7 +25,11 @@
 
     // this seeding is only for the template to bootstrap the DB and users.
     // in production you will likely want a different approach.
-    SeedData.EnsureSeedData(app);
+    RetryPolicy retryPolicy = Policy
+        .Handle<NpgsqlException>()
+        .WaitAndRetry(5, retryAttempt => TimeSpan.FromSeconds(10));
+
+    retryPolicy.ExecuteAndCapture(() => SeedData.EnsureSeedData(app));
 
     app.Run();
 }

diff --git a/src/NotificationService/Program.cs b/src/NotificationService/Program.cs
@@ -16,6 +16,12 @@
 
     config.UsingRabbitMq((context, cfg) => 
     {
+        cfg.UseMessageRetry(r => 
+        {
+            r.Handle<RabbitMqConnectionException>();
+            r.Interval(5, TimeSpan.FromSeconds(10));
+        });
+
         cfg.Host(builder.Configuration["RabbitMQ:Host"], "/", host => 
         {
             host.Username(builder.Configuration.GetValue("RabbitMQ:Username", "guest"));

diff --git a/src/SearchService/Program.cs b/src/SearchService/Program.cs
@@ -22,6 +22,11 @@
 
     config.UsingRabbitMq((context, cfg) => 
     {
+        cfg.UseMessageRetry(r => {
+            r.Handle<RabbitMqConnectionException>();
+            r.Interval(5, TimeSpan.FromSeconds(10));
+        });
+
         cfg.Host(builder.Configuration["RabbitMQ:Host"], "/", host => 
         {
             host.Username(builder.Configuration.GetValue("RabbitMQ:Username", "guest"));
@@ -44,15 +49,11 @@
 
 app.MapControllers();
 
-app.Lifetime.ApplicationStarted.Register(async () => {
-    try
-    {
-        await DbInitializer.InitDb(app);
-    }
-    catch (Exception ex)
-    {
-        Console.WriteLine($"--> Something went wrong: {ex}");
-    }
+app.Lifetime.ApplicationStarted.Register(async () =>
+{
+    await Policy.Handle<TimeoutException>()
+        .WaitAndRetryAsync(5, retryAttempt => TimeSpan.FromSeconds(5))
+        .ExecuteAndCaptureAsync(async () => await DbInitializer.InitDb(app));
 });
 
 app.Run();

diff --git a/src/SearchService/SearchService.csproj b/src/SearchService/SearchService.csproj
@@ -12,6 +12,7 @@
     <PackageReference Include="MassTransit.RabbitMQ" Version="8.1.3" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.1" />
     <PackageReference Include="MongoDB.Entities" Version="23.0.1" />
+    <PackageReference Include="Polly" Version="8.3.0" />
   </ItemGroup>
 
 </Project>