From 6757eb342e2ebafa4f97e4add723d334170ed5c1 Mon Sep 17 00:00:00 2001 From: khwezi Date: Sun, 10 May 2026 09:02:57 +0200 Subject: [PATCH 1/2] Added release tagging to deployment, increased replica count to 2 --- .drone.yml | 29 +++++++++++++++++++++++------ litecharms-shop-uat.yml | 2 +- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index f295606..118e17b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,20 +31,37 @@ steps: registry: nexus.khongisa.co.za repo: nexus.khongisa.co.za/litecharms-shop 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" - - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/litecharmsshop.git + - echo "169.255.58.144 gitea.khongisa.co.za" >> /etc/hosts + - 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 +83,7 @@ steps: - mkdir -p $HOME/.kube - echo "$KUBE_CONFIG" > $HOME/.kube/config - kubectl apply -f litecharms-shop-uat.yml - - kubectl rollout restart deployment/litecharms-shop-uat -n litecharms-shop-uat + - kubectl set image deployment/litecharms-shop-uat shop=nexus.khongisa.co.za/litecharms-shop:1.${DRONE_BUILD_NUMBER} -n litecharms-shop-uat depends_on: - package @@ -88,7 +105,7 @@ steps: - mkdir -p $HOME/.kube - echo "$KUBE_CONFIG" > $HOME/.kube/config - kubectl apply -f litecharms-shop.yml - - kubectl rollout restart shop/deployment/litecharms-shop -n litecharms-shop + - kubectl set image deployment/litecharms-shop shop=nexus.khongisa.co.za/litecharms-shop:1.${DRONE_BUILD_NUMBER} -n litecharms-shop depends_on: - uat diff --git a/litecharms-shop-uat.yml b/litecharms-shop-uat.yml index 3a6608c..ff683ac 100644 --- a/litecharms-shop-uat.yml +++ b/litecharms-shop-uat.yml @@ -44,7 +44,7 @@ metadata: name: litecharms-shop namespace: litecharms-shop-uat spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: shop From 3beebe16d36d844e3be375544d5b8de958f1b14c Mon Sep 17 00:00:00 2001 From: khwezi Date: Sun, 10 May 2026 09:03:32 +0200 Subject: [PATCH 2/2] Removed explicit image specification --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 118e17b..053643d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -83,7 +83,6 @@ steps: - mkdir -p $HOME/.kube - echo "$KUBE_CONFIG" > $HOME/.kube/config - kubectl apply -f litecharms-shop-uat.yml - - kubectl set image deployment/litecharms-shop-uat shop=nexus.khongisa.co.za/litecharms-shop:1.${DRONE_BUILD_NUMBER} -n litecharms-shop-uat depends_on: - package @@ -105,7 +104,6 @@ steps: - mkdir -p $HOME/.kube - echo "$KUBE_CONFIG" > $HOME/.kube/config - kubectl apply -f litecharms-shop.yml - - kubectl set image deployment/litecharms-shop shop=nexus.khongisa.co.za/litecharms-shop:1.${DRONE_BUILD_NUMBER} -n litecharms-shop depends_on: - uat