Compare commits

...

22 Commits

Author SHA1 Message Date
khwezi 36dc31e85b Merge pull request 'Implemented startup jobs' (#13) from migration into master
Reviewed-on: #13
2026-05-10 17:22:01 +02:00
Khwezi Mngoma 41f92d0670 Implemented startup jobs
continuous-integration/drone/pr Build is passing
2026-05-10 17:20:57 +02:00
khwezi e9a1552e6d Merge pull request 'Updated to use new shop database' (#12) from migration into master
Reviewed-on: #12
2026-05-10 11:24:04 +02:00
Khwezi Mngoma 988ba4113c Updated to use new shop database
continuous-integration/drone/pr Build is passing
2026-05-10 11:23:35 +02:00
khwezi f62ac1bc71 Merge pull request 'Populated README' (#11) from migration into master
Reviewed-on: #11
2026-05-10 09:49:10 +02:00
Khwezi Mngoma 544eef0e49 Populated README
continuous-integration/drone/pr Build is passing
2026-05-10 09:47:42 +02:00
khwezi a7b9e945a3 Merge pull request 'Added host entry to my gitea instance to git tag and release commands' (#10) from migration into master
Reviewed-on: #10
2026-05-10 08:54:39 +02:00
Khwezi Mngoma 4a20c5ea5f Added host entry to my gitea instance to git tag and release commands
continuous-integration/drone/pr Build is passing
2026-05-10 08:54:14 +02:00
khwezi 6f5892c228 Merge pull request 'migration' (#9) from migration into master
Reviewed-on: #9
2026-05-10 08:47:01 +02:00
Khwezi Mngoma 23d992704e Removed image specification on uat deploy
continuous-integration/drone/pr Build is failing
2026-05-10 08:46:40 +02:00
Khwezi Mngoma 581cd2084a Added step to install curl on tag and release step 2026-05-10 08:45:54 +02:00
khwezi 87bfc65b34 Merge pull request 'Added git tag and release step to package' (#8) from migration into master
Reviewed-on: #8
2026-05-10 08:38:40 +02:00
Khwezi Mngoma aef2884e8e Added git tag and release step to package
continuous-integration/drone/pr Build is failing
2026-05-10 08:38:10 +02:00
khwezi c18635a0d4 Merge pull request 'migration' (#7) from migration into master
Reviewed-on: #7
2026-05-10 08:24:19 +02:00
Khwezi Mngoma 84597be935 Updated nuget packages
continuous-integration/drone/pr Build is passing
2026-05-10 08:23:50 +02:00
Khwezi Mngoma 13370ccb7f Increased replica sets from 1 to 3 2026-05-10 08:17:47 +02:00
khwezi ce7bcd20ac Merge pull request 'Refactored pipeline and k8s manifest' (#6) from migration into master
Reviewed-on: #6
2026-05-10 08:08:39 +02:00
Khwezi Mngoma d84de56a9d Refactored pipeline and k8s manifest
continuous-integration/drone/pr Build is passing
2026-05-10 08:08:01 +02:00
khwezi d7215ff278 Merge pull request 'Refactore manifest deployment name' (#5) from migration into master
Reviewed-on: #5
2026-05-09 19:00:31 +02:00
Khwezi Mngoma d934cc6251 Refactore manifest deployment name
continuous-integration/drone/pr Build is failing
2026-05-09 18:59:50 +02:00
khwezi 7dc60b1235 Merge pull request 'Refactored pipeline to ferer to the correct deployment name' (#4) from migration into master
Reviewed-on: #4
2026-05-09 18:50:57 +02:00
Khwezi Mngoma 113c3ef268 Refactored pipeline to ferer to the correct deployment name
continuous-integration/drone/pr Build is failing
2026-05-09 18:50:37 +02:00
7 changed files with 76 additions and 62 deletions
+22 -6
View File
@@ -31,20 +31,37 @@ steps:
registry: nexus.khongisa.co.za registry: nexus.khongisa.co.za
repo: nexus.khongisa.co.za/litecharms-scheduler repo: nexus.khongisa.co.za/litecharms-scheduler
tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ] 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 } username: { from_secret: docker_username }
password: { from_secret: docker_password } password: { from_secret: docker_password }
- name: gitea-tag - name: gitea-tag-release
image: alpine/git image: alpine/git
environment: environment:
GITEA_TOKEN: { from_secret: git_token }
GITEA_USER: { from_secret: git_username } GITEA_USER: { from_secret: git_username }
GITEA_PASS: { from_secret: git_password } GITEA_PASS: { from_secret: git_password }
commands: commands:
- git config --global user.email "drone@litecharms.co.za" - echo "169.255.58.144 gitea.khongisa.co.za" >> /etc/hosts
- 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 remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/scheduler.git
- git tag 1.${DRONE_BUILD_NUMBER} - git tag 1.${DRONE_BUILD_NUMBER}
- git push origin 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: depends_on:
- build - build
@@ -66,7 +83,6 @@ steps:
- mkdir -p $HOME/.kube - mkdir -p $HOME/.kube
- echo "$KUBE_CONFIG" > $HOME/.kube/config - echo "$KUBE_CONFIG" > $HOME/.kube/config
- kubectl apply -f litecharms-scheduler-uat.yml - kubectl apply -f litecharms-scheduler-uat.yml
- kubectl rollout restart deployment/litecharms-scheduler -n litecharms-scheduler-uat
depends_on: depends_on:
- package - package
@@ -88,7 +104,7 @@ steps:
- mkdir -p $HOME/.kube - mkdir -p $HOME/.kube
- echo "$KUBE_CONFIG" > $HOME/.kube/config - echo "$KUBE_CONFIG" > $HOME/.kube/config
- kubectl apply -f litecharms-scheduler.yml - 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: depends_on:
- uat - uat
@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LiteCharms.Abstractions" Version="1.13.0" /> <PackageReference Include="LiteCharms.Abstractions" Version="1.19.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
<PackageReference Include="Mediator.SourceGenerator" Version="3.0.2"> <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
@@ -18,9 +18,9 @@
<!-- Lite Charms Libraries --> <!-- Lite Charms Libraries -->
<ItemGroup> <ItemGroup>
<PackageReference Include="LiteCharms.Extensions" Version="1.13.0" /> <PackageReference Include="LiteCharms.Extensions" Version="1.19.0" />
<PackageReference Include="LiteCharms.Features" Version="1.13.0" /> <PackageReference Include="LiteCharms.Features" Version="1.19.0" />
<PackageReference Include="LiteCharms.Models" Version="1.13.0" /> <PackageReference Include="LiteCharms.Models" Version="1.19.0" />
</ItemGroup> </ItemGroup>
<!-- Shared Global Usings --> <!-- Shared Global Usings -->
+2 -2
View File
@@ -10,9 +10,9 @@ builder.Services.AddSalesServiceBus();
builder.Services.AddGeneralServiceBus(); builder.Services.AddGeneralServiceBus();
builder.Services.AddEmailServices(builder.Configuration); builder.Services.AddEmailServices(builder.Configuration);
builder.Services.AddShopDatabase(builder.Configuration); builder.Services.AddShopDatabase(builder.Configuration);
builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, ShopSchedulerInstanceId, builder.Configuration); builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
builder.Services.AddHostedService<Worker>(); builder.Services.AddHostedService<JobWorker>();
var host = builder.Build(); var host = builder.Build();
+15
View File
@@ -0,0 +1,15 @@
using LiteCharms.Abstractions;
using LiteCharms.Features.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 1 * * * ?", stoppingToken);
logger.LogInformation("Startup jobs scheduled");
}
}
}
-17
View File
@@ -1,17 +0,0 @@
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);
}
}
}
}
+18 -1
View File
@@ -1 +1,18 @@
# LiteCharms # 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.*
+15 -32
View File
@@ -25,32 +25,33 @@ metadata:
namespace: litecharms-scheduler-uat namespace: litecharms-scheduler-uat
type: Opaque type: Opaque
data: data:
connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU= connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNob3AtZGV2O1VzZXJuYW1lPXNob3AtZGV2LXVzZXI7UGFzc3dvcmQ9a1ZWbW9XS0ozeHpnUVg7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ== discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw== aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
email-password: JFpTLWVJQGlYbTVNUCRhfg== email-password: JFpTLWVJQGlYbTVNUCRhfg==
quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QpU2VjdXJpdHkgSW5mbz1UcnVl
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: Service
metadata: metadata:
name: scheduler-data-pvc name: scheduler-worker-service
namespace: litecharms-scheduler-uat namespace: litecharms-scheduler-uat
spec: spec:
accessModes: ["ReadWriteMany"] clusterIP: None
storageClassName: nfs-storage selector:
resources: app: scheduler
requests: ports:
storage: 2Gi - port: 80
name: dummy-port
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: litecharms-scheduler name: litecharms-scheduler-uat
namespace: litecharms-scheduler-uat namespace: litecharms-scheduler-uat
spec: spec:
serviceName: "scheduler-worker" serviceName: "scheduler-worker-service"
replicas: 1 replicas: 3
selector: selector:
matchLabels: matchLabels:
app: scheduler app: scheduler
@@ -62,6 +63,7 @@ spec:
containers: containers:
- name: scheduler - name: scheduler
image: nexus.khongisa.co.za/litecharms-scheduler:latest image: nexus.khongisa.co.za/litecharms-scheduler:latest
imagePullPolicy: Always
resources: resources:
limits: limits:
memory: "2Gi" memory: "2Gi"
@@ -82,7 +84,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: scheduler-secrets name: scheduler-secrets
key: quartz-store key: connection-string-quartz
- name: ConnectionStrings__PostgresShop - name: ConnectionStrings__PostgresShop
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
@@ -98,22 +100,3 @@ spec:
secretKeyRef: secretKeyRef:
name: scheduler-secrets name: scheduler-secrets
key: aspire-apikey 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