Merge pull request 'migration' (#9) from migration into master

Reviewed-on: #9

.drone.yml

@@ -31,20 +31,36 @@ 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
+  
+  - name: gitea-tag-release
     image: alpine/git
     environment:
+      GITEA_TOKEN: { from_secret: git_token }
       GITEA_USER: { from_secret: git_username }
       GITEA_PASS: { from_secret: git_password }    
     commands:
-      - git config --global user.email "drone@litecharms.co.za"
-      - git config --global user.name "Drone CI"      
+      - apk add --no-cache curl
       - 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
@@ -66,7 +82,6 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-scheduler-uat.yml
-      - kubectl rollout restart deployment/litecharms-scheduler-uat -n litecharms-scheduler-uat
 
 depends_on:
   - package
@@ -88,7 +103,7 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-scheduler.yml
-      - kubectl rollout restart shop/deployment/litecharms-scheduler -n litecharms-scheduler
+      - kubectl rollout restart statefulset/litecharms-scheduler -n litecharms-scheduler
 
 depends_on:
   - uat

LiteCharmsScheduler/LiteCharmsScheduler.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Abstractions" Version="1.13.0" />
+    <PackageReference Include="LiteCharms.Abstractions" Version="1.14.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
     <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
@@ -18,9 +18,9 @@
 
   <!-- Lite Charms Libraries -->
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Extensions" Version="1.13.0" />
-    <PackageReference Include="LiteCharms.Features" Version="1.13.0" />
-    <PackageReference Include="LiteCharms.Models" Version="1.13.0" />
+    <PackageReference Include="LiteCharms.Extensions" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Models" Version="1.14.0" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->

LiteCharmsScheduler/Program.cs

@@ -10,7 +10,7 @@ builder.Services.AddSalesServiceBus();
 builder.Services.AddGeneralServiceBus();
 builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddShopDatabase(builder.Configuration);
-builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, ShopSchedulerInstanceId, builder.Configuration);
+builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
 
 builder.Services.AddHostedService<Worker>();
 

litecharms-scheduler-uat.yml

@@ -25,32 +25,33 @@ metadata:
   namespace: litecharms-scheduler-uat
 type: Opaque
 data:  
+  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
   connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
   discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
   aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
   email-password: JFpTLWVJQGlYbTVNUCRhfg==
-  quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QpU2VjdXJpdHkgSW5mbz1UcnVl
 ---
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: Service
 metadata:
-  name: scheduler-data-pvc
+  name: scheduler-worker-service
   namespace: litecharms-scheduler-uat
 spec:
-  accessModes: ["ReadWriteMany"]
-  storageClassName: nfs-storage
-  resources:
-    requests:
-      storage: 2Gi
+  clusterIP: None
+  selector:
+    app: scheduler
+  ports:
+    - port: 80
+      name: dummy-port
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: litecharms-scheduler
+  name: litecharms-scheduler-uat
   namespace: litecharms-scheduler-uat
 spec:
-  serviceName: "scheduler-worker"
-  replicas: 1
+  serviceName: "scheduler-worker-service"
+  replicas: 3
   selector:
     matchLabels:
       app: scheduler
@@ -62,6 +63,7 @@ spec:
       containers:
         - name: scheduler
           image: nexus.khongisa.co.za/litecharms-scheduler:latest
+          imagePullPolicy: Always
           resources:
             limits:
               memory: "2Gi"
@@ -82,7 +84,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: scheduler-secrets
-                  key: quartz-store
+                  key: connection-string-quartz
             - name: ConnectionStrings__PostgresShop
               valueFrom:
                 secretKeyRef:
@@ -98,22 +100,3 @@ 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