Merge pull request #30 from mapswipe/feat/helm-update

Feat/helm update

Author: tnagorra

.github/workflows/ci.yml

@@ -85,8 +85,8 @@ jobs:
 
           # XXX: Check if there is a slash in the BRANCH_NAME eg: project/add-docker
           if [[ "$BRANCH_NAME" == *"/"* ]]; then
-              # XXX: Change the docker image package to -alpha
-              IMAGE_NAME="$IMAGE_NAME-alpha"
+              # XXX: Change the docker image package to -dev
+              IMAGE_NAME="$IMAGE_NAME-dev"
               TAG="$(echo "$BRANCH_NAME" | sed 's|/|-|g').$(echo $GIT_HASH)"
           else
               TAG="$BRANCH_NAME.$(echo $GIT_HASH)"
@@ -183,7 +183,7 @@ jobs:
           helm dependency build ./helm/
 
       - name: Helm lint
-        run: helm lint ./helm --values ./helm/values-test.yaml
+        run: helm lint ./helm --values ./helm/linter_values.yaml
 
       - name: Helm template
-        run: helm template ./helm --values ./helm/values-test.yaml
+        run: helm template ./helm --values ./helm/linter_values.yaml

.github/workflows/helm-publish.yml

@@ -62,8 +62,8 @@ jobs:
       run: |
         # XXX: Check if there is a slash in the BRANCH_NAME eg: project/add-docker
         if [[ "$GITHUB_REF_NAME" == *"/"* ]]; then
-            # XXX: Change the helm chart to <chart-name>-alpha
-            sed -i 's/^name: \(.*\)/name: \1-alpha/' ./helm/Chart.yaml
+            # XXX: Change the helm chart to <chart-dev-name>
+            sed -i 's/^\(name:.*\)-helm$/\1-dev-helm/' ./helm/Chart.yaml
         fi
 
         sed -i "s/SET-BY-CICD/$IMAGE_TAG/g" ./helm/Chart.yaml
@@ -72,7 +72,7 @@ jobs:
     - name: Push Helm Chart
       env:
         IMAGE: ${{ needs.ci.outputs.docker_image }}
-        OCI_REPO: oci://ghcr.io/${{ github.repository }}
+        OCI_REPO: oci://ghcr.io/${{ github.repository_owner }}
       run: |
         OCI_REPO=$(echo $OCI_REPO | tr '[:upper:]' '[:lower:]')
         PACKAGE_FILE=$(ls ./helm/.helm-charts/*.tgz | head -n 1)
@@ -82,4 +82,12 @@ jobs:
         helm push "$PACKAGE_FILE" $OCI_REPO 2>> $GITHUB_STEP_SUMMARY
         echo '```' >> $GITHUB_STEP_SUMMARY
         echo "> [!Important]" >> $GITHUB_STEP_SUMMARY
-        echo "> NOTE: Tagged docker image: **$IMAGE**" >> $GITHUB_STEP_SUMMARY
+        echo "> Helm Repo URL: **$OCI_REPO**" >> $GITHUB_STEP_SUMMARY
+        echo "> Helm Chart: **$(helm show chart "$PACKAGE_FILE" | grep '^name:' | awk '{print $2}')**" >> $GITHUB_STEP_SUMMARY
+        echo "> Helm Target Revision: **$(helm show chart "$PACKAGE_FILE" | grep '^version:' | awk '{print $2}')**" >> $GITHUB_STEP_SUMMARY
+        echo "> Docker image: **$IMAGE**" >> $GITHUB_STEP_SUMMARY
+
+        # Add annotations as well
+        echo "::notice::Helm Repo URL: **$OCI_REPO**"
+        echo "::notice::Helm Chart: **$(helm show chart "$PACKAGE_FILE" | grep '^name:' | awk '{print $2}')**"
+        echo "::notice::Helm Target Revision: **$(helm show chart "$PACKAGE_FILE" | grep '^version:' | awk '{print $2}')**"

Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.13-slim-bookworm AS base
-COPY --from=ghcr.io/astral-sh/uv:0.6.2 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.7.4 /uv /uvx /bin/
 
 LABEL maintainer="Mapswipe Dev"
 LABEL org.opencontainers.image.source="https://github.com/mapswipe/mapswipe-backend/"

helm/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: django-app
   repository: oci://ghcr.io/toggle-corp/charts
-  version: 0.0.1
-digest: sha256:f6da87e3dbcd9008036499bac3ef4bcdedb77b53793b8a0952a356df5ccff3e4
-generated: "2025-03-04T10:20:54.384864288+05:45"
+  version: 0.1.1
+digest: sha256:b6d04c208a99e0dbe4c9c15446cfbd10c7bedf64eca38a929f6a78725f8d6367
+generated: "2025-05-16T14:21:28.080402011+05:45"

helm/Chart.yaml

@@ -9,5 +9,5 @@ sources:
 dependencies:
   - name: django-app
     alias: app
-    version: 0.0.1
+    version: 0.1.1
     repository: oci://ghcr.io/toggle-corp/charts

helm/values-test.yaml helm/linter_values.yamlhelm/values-test.yaml renamed to helm/linter_values.yaml

@@ -1,4 +1,5 @@
 app:
+  environment: PROD
   image:
     name: ghcr.io/mapswipe/mapswipe-backend
     tag: latest

helm/values.yaml

@@ -1,14 +1,19 @@
 app:
+  environment: PROD
+  # Global Image
+  appTypeEnvName: "APP_TYPE"
   image:
     name: SET-BY-CICD-IMAGE
     tag: SET-BY-CICD-TAG
+    imagePullPolicy: IfNotPresent
 
   ingress:
     enabled: true
     className: nginx
 
   redis:
     enabled: true
+    fullnameOverride: "mapswipe-redis"
 
   postgresql:
     enabled: true
@@ -39,16 +44,55 @@ app:
 
   api:
     containerPort: 80
-    command: ["gunicorn", "config.wsgi:application", "--timeout=40", "--bind", "0.0.0.0:80"]
+    command: ["gunicorn", "main.wsgi:application", "--timeout=40", "--bind", "0.0.0.0:80"]
     resources:
       requests:
         cpu: "0.2"
 
   worker:
     enabled: true
+    beat:
+      command: ["celery", "-A", "main", "beat", "-l", "INFO"]
+      resources:
+        requests:
+          cpu: "0.1"
+          memory: 0.5Gi
+        limits:
+          cpu: "1"
+          memory: 1Gi
+    flower:
+      enabled: false
+    queueDefaultResources:
+      requests:
+        cpu: "0.1"
+        memory: 1Gi
+      limits:
+        cpu: "4"
+        memory: 2Gi
+    queueCommandPrefix:
+      - "celery"
+      - "-A"
+      - "main"
+      - "worker"
+      - "-l"
+      - "INFO"
+    queues:
+      # NOTE: Make sure keys are lowercase
+      default:
+        enabled: true
+        replicaCount: 1
+        celeryArgs:
+          - "-Q"
+          - "celery"
+          - "--concurrency"
+          - "4"
+          - "--max-tasks-per-child"
+          - "10"
 
   # NOTE: Check main/settings.py for all available options
   env:
+    APP_RELEASE: "{{ $.Values.image.tag }}"
+    APP_ENVIRONMENT: "{{ $.Values.environment }}"
     # AWS
     AWS_S3_ENABLED: "true"
     AWS_S3_ENDPOINT_URL: "https://{{ $.Values.minio.apiIngress.hostname }}/"
@@ -70,4 +114,7 @@ app:
     # Minio (S3)
     AWS_S3_ACCESS_KEY_ID: "{{ required \".Values.minio.auth.rootUser\" $.Values.minio.auth.rootUser }}"
     AWS_S3_SECRET_ACCESS_KEY: "{{ required \".Values.minio.auth.rootPassword\" $.Values.minio.auth.rootPassword }}"
-    AWS_S3_REGION: "us-east-1"
+    AWS_S3_REGION_NAME: "us-east-1"
+    # Redis
+    CELERY_REDIS_URL: "redis://{{ printf \"%s-master\" (include \"common.names.fullname\" $.Subcharts.redis) }}:6379/0"
+    CACHE_REDIS_URL: "redis://{{ printf \"%s-master\" (include \"common.names.fullname\" $.Subcharts.redis) }}:6379/1"

pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "django-environ",
     "django-premailer",
     "django-redis",
-    "django-storages",
+    "django-storages[s3]",
     "djangoql", # Admin panel query search
     "djangorestframework",
     "factory-boy~=3.2.1",