Merge pull request 'Refactore manifest deployment name' (#5) from migration into master

Reviewed-on: #5

.drone.yml

@@ -31,37 +31,20 @@ steps:
       registry: nexus.khongisa.co.za
       repo: nexus.khongisa.co.za/litecharms-scheduler
       tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
-      custom_labels:
-        - org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/scheduler
-        - org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}
-        - org.opencontainers.image.revision=${DRONE_COMMIT_SHA}
       username: { from_secret: docker_username }
       password: { from_secret: docker_password }
-  
-  - name: gitea-tag-release
+
+  - name: gitea-tag
     image: alpine/git
     environment:
-      GITEA_TOKEN: { from_secret: git_token }
       GITEA_USER: { from_secret: git_username }
       GITEA_PASS: { from_secret: git_password }    
     commands:
-      - echo "169.255.58.144 gitea.khongisa.co.za" >> /etc/hosts
-      - apk add --no-cache curl
+      - git config --global user.email "drone@litecharms.co.za"
+      - git config --global user.name "Drone CI"      
       - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/scheduler.git
       - git tag 1.${DRONE_BUILD_NUMBER}
       - git push origin 1.${DRONE_BUILD_NUMBER}
-      - |
-        curl -X POST "https://gitea.khongisa.co.za/api/v1/repos/litecharms/scheduler/releases" \
-             -H "Authorization: token $${GITEA_TOKEN}" \
-             -H "Content-Type: application/json" \
-             -d "{
-               \"tag_name\": \"1.${DRONE_BUILD_NUMBER}\",
-               \"target_commitish\": \"${DRONE_COMMIT_SHA}\",
-               \"name\": \"Release 1.${DRONE_BUILD_NUMBER}\",
-               \"body\": \"### Artifacts\n* **Docker Image:** nexus.khongisa.co.za/litecharms-scheduler:1.${DRONE_BUILD_NUMBER}\n* **NuGet:** [View on Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
-               \"draft\": false,
-               \"prerelease\": false
-             }"
 
 depends_on:
   - build
@@ -83,8 +66,7 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-scheduler-uat.yml
-      - sleep 10
-      - kubectl rollout restart statefulset/litecharms-scheduler-uat -n litecharms-scheduler-uat
+      - kubectl rollout restart deployment/litecharms-scheduler-uat -n litecharms-scheduler-uat
 
 depends_on:
   - package
@@ -106,8 +88,7 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-scheduler.yml
-      - sleep 10
-      - kubectl rollout restart statefulset/litecharms-scheduler -n litecharms-scheduler
+      - kubectl rollout restart shop/deployment/litecharms-scheduler -n litecharms-scheduler
 
 depends_on:
   - uat

LiteCharmsScheduler/LiteCharmsScheduler.csproj

@@ -8,7 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
+    <PackageReference Include="LiteCharms.Abstractions" Version="1.13.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
     <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -17,7 +18,9 @@
 
   <!-- Lite Charms Libraries -->
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.26.0" />
+    <PackageReference Include="LiteCharms.Extensions" Version="1.13.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.13.0" />
+    <PackageReference Include="LiteCharms.Models" Version="1.13.0" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->

LiteCharmsScheduler/Program.cs

@@ -1,27 +1,18 @@
-using LiteCharms.Features.Extensions;
-using LiteCharms.Features.Mediator;
+using LiteCharms.Extensions;
 using LiteCharmsScheduler.Workers;
-using Mediator;
-using static LiteCharms.Features.Email.Extensions.Constants;
+using static LiteCharms.Abstractions.Constants;
 
 var builder = Host.CreateApplicationBuilder(args);
 
 builder.Services.AddMediator();
-
-builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
-builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
-
-builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddEmailServiceBus();
-
 builder.Services.AddSalesServiceBus();
 builder.Services.AddGeneralServiceBus();
-builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
-
-builder.Services.AddShopServices();
+builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddShopDatabase(builder.Configuration);
+builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, ShopSchedulerInstanceId, builder.Configuration);
 
-builder.Services.AddHostedService<JobWorker>();
+builder.Services.AddHostedService<Worker>();
 
 var host = builder.Build();
 

LiteCharmsScheduler/Workers/JobWorker.cs

@@ -1,15 +0,0 @@
-using LiteCharms.Features.Quartz.Abstractions;
-using LiteCharms.Features.Shop.Notifications.Events;
-
-namespace LiteCharmsScheduler.Workers
-{
-    public class JobWorker(IJobOrchestrator jobOrchestrator, ILogger<JobWorker> logger) : BackgroundService
-    {
-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-        {
-            await jobOrchestrator.ScheduleAsync(ProcessEmailNotificationsEvent.Create(), "0 */5 * * * ?", stoppingToken);
-
-            logger.LogInformation("Startup jobs scheduled");
-        }
-    }
-}

LiteCharmsScheduler/Workers/Worker.cs

@@ -0,0 +1,17 @@
+namespace LiteCharmsScheduler.Workers
+{
+    public class Worker(ILogger<Worker> logger) : BackgroundService
+    {
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (!stoppingToken.IsCancellationRequested)
+            {
+                if (logger.IsEnabled(LogLevel.Information))
+                {
+                    logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+                }
+                await Task.Delay(1000, stoppingToken);
+            }
+        }
+    }
+}

README.md

@@ -1,18 +1 @@
-# LiteCharms.Scheduler
-
-The background processing engine responsible for automated tasks and scheduled jobs.
-
-## 🏗 Architecture
-* **Type:** Kubernetes **StatefulSet**
-* **Persistence:** Uses Postgres at `192.168.1.170`.
-* **Clustering:** Configured for Quartz.NET/Hangfire clustering to support multiple replicas without task duplication.
-
-## 🚀 CI/CD Workflow
-* **Trigger:** Pull Request to `master`.
-* **Versioning:** Automated Gitea Releases with links to Docker and NuGet artifacts.
-* **Identity:** Uses stable network identifiers (`litecharms-scheduler-0`, etc.) to maintain lock integrity in the database.
-
-## ⚙️ Scaling
-To scale the scheduler:
-`kubectl scale statefulset litecharms-scheduler --replicas=3`
-*Note: Ensure Database Job Store is enabled in appsettings before scaling.*
+# LiteCharms

litecharms-scheduler-uat.yml

@@ -25,24 +25,23 @@ metadata:
   namespace: litecharms-scheduler-uat
 type: Opaque
 data:  
-  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
-  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNob3AtZGV2O1VzZXJuYW1lPXNob3AtZGV2LXVzZXI7UGFzc3dvcmQ9a1ZWbW9XS0ozeHpnUVg7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
+  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
   discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
   aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
   email-password: JFpTLWVJQGlYbTVNUCRhfg==
+  quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QpU2VjdXJpdHkgSW5mbz1UcnVl
 ---
 apiVersion: v1
-kind: Service
+kind: PersistentVolumeClaim
 metadata:
-  name: scheduler-worker-service
+  name: scheduler-data-pvc
   namespace: litecharms-scheduler-uat
 spec:
-  clusterIP: None
-  selector:
-    app: scheduler
-  ports:
-    - port: 80
-      name: dummy-port
+  accessModes: ["ReadWriteMany"]
+  storageClassName: nfs-storage
+  resources:
+    requests:
+      storage: 2Gi
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -50,8 +49,8 @@ metadata:
   name: litecharms-scheduler-uat
   namespace: litecharms-scheduler-uat
 spec:
-  serviceName: "scheduler-worker-service"
-  replicas: 3
+  serviceName: "scheduler-worker"
+  replicas: 1
   selector:
     matchLabels:
       app: scheduler
@@ -63,7 +62,6 @@ spec:
       containers:
         - name: scheduler
           image: nexus.khongisa.co.za/litecharms-scheduler:latest
-          imagePullPolicy: Always
           resources:
             limits:
               memory: "2Gi"
@@ -84,7 +82,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: scheduler-secrets
-                  key: connection-string-quartz
+                  key: quartz-store
             - name: ConnectionStrings__PostgresShop
               valueFrom:
                 secretKeyRef:
@@ -100,3 +98,22 @@ spec:
                 secretKeyRef:
                   name: scheduler-secrets
                   key: aspire-apikey
+          volumeMounts:
+            - name: storage
+              mountPath: /app/wwwroot/content
+              subPath: content
+            - name: storage
+              mountPath: /app/keys
+              subPath: dataprotection-keys
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - ps aux | grep LiteCharmsScheduler.dll | grep -v grep
+            initialDelaySeconds: 30
+            periodSeconds: 60
+      volumes:
+        - name: storage
+          persistentVolumeClaim:
+            claimName: scheduler-data-pvc