From 2730bd996e36b262a364d6d812c06ffdf6d76ac4 Mon Sep 17 00:00:00 2001 From: thenav56 Date: Fri, 4 Apr 2025 15:39:09 +0545 Subject: [PATCH 1/3] Enable args in argoHook --- toggle/django-app/templates/argo-hooks/hook-job.yaml | 3 +++ toggle/django-app/values-test.yaml | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/toggle/django-app/templates/argo-hooks/hook-job.yaml b/toggle/django-app/templates/argo-hooks/hook-job.yaml index 206ee16..be109b9 100644 --- a/toggle/django-app/templates/argo-hooks/hook-job.yaml +++ b/toggle/django-app/templates/argo-hooks/hook-job.yaml @@ -24,6 +24,9 @@ spec: image: "{{ default $.Values.argoHook.image.name $.Values.image.name }}:{{ default $.Values.argoHook.image.tag $.Values.image.tag }}" imagePullPolicy: {{ default $.Values.argoHook.image.imagePullPolicy $.Values.image.imagePullPolicy }} command: {{ toYaml $hook.command | trim | nindent 12 }} + {{- if $hook.args }} + args: {{ toYaml $hook.args | trim | nindent 12 }} + {{- end }} resources: {{- toYaml (default $hook.resources $.Values.argoHook.resources) | nindent 12 }} env: diff --git a/toggle/django-app/values-test.yaml b/toggle/django-app/values-test.yaml index 5df8d40..fbbdf91 100644 --- a/toggle/django-app/values-test.yaml +++ b/toggle/django-app/values-test.yaml @@ -66,6 +66,17 @@ worker: requests: cpu: "0.1" +argoHook: + enabled: true + hooks: + my-custom-command: + enabled: true + hook: PostSync + preserveHistory: true + command: ["/bin/bash", "-c"] + args: + - "date --iso-8601 && ls" + env: ENV_1: VALUE_1 From d55d2c74bc2aca1817617b97a801b528a0690513 Mon Sep 17 00:00:00 2001 From: thenav56 Date: Fri, 4 Apr 2025 15:40:01 +0545 Subject: [PATCH 2/3] Add rabbitmq to the chart --- toggle/django-app/Chart.lock | 7 +++++-- toggle/django-app/Chart.yaml | 4 ++++ toggle/django-app/values.yaml | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/toggle/django-app/Chart.lock b/toggle/django-app/Chart.lock index fd4b6f8..a4c3bf1 100644 --- a/toggle/django-app/Chart.lock +++ b/toggle/django-app/Chart.lock @@ -1,4 +1,7 @@ dependencies: +- name: rabbitmq + repository: https://charts.bitnami.com/bitnami + version: 15.4.2 - name: redis repository: https://charts.bitnami.com/bitnami version: 20.6.3 @@ -8,5 +11,5 @@ dependencies: - name: minio repository: https://charts.bitnami.com/bitnami version: 14.10.5 -digest: sha256:bb671bae5b6453f7da356f8482f2ccf7eb182b7d38c28fea28e39841c8bb41b5 -generated: "2025-02-11T14:41:21.280715684+05:45" +digest: sha256:d13c4b60bfcbb8354039fa1bbf090428182038339cb096c48bedf8447dd281da +generated: "2025-04-04T15:36:03.574423508+05:45" diff --git a/toggle/django-app/Chart.yaml b/toggle/django-app/Chart.yaml index bebe772..216c604 100644 --- a/toggle/django-app/Chart.yaml +++ b/toggle/django-app/Chart.yaml @@ -7,6 +7,10 @@ sources: - https://github.com/toggle-corp/charts dependencies: + - name: rabbitmq + version: 15.4.2 + repository: https://charts.bitnami.com/bitnami + condition: rabbitmq.enabled - name: redis version: 20.6.3 repository: https://charts.bitnami.com/bitnami diff --git a/toggle/django-app/values.yaml b/toggle/django-app/values.yaml index 8506d59..9c34f7e 100644 --- a/toggle/django-app/values.yaml +++ b/toggle/django-app/values.yaml @@ -69,6 +69,31 @@ minio: extraCommands: - "mc anonymous set download provisioning/static-data" +rabbitmq: + enabled: false + fullnameOverride: "django-rabbitmq" + auth: + username: django + password: + erlangCookie: # Generate using `dd if=/dev/urandom bs=30 count=1 | base64` + # XXX: Don't change this (`celery` vhost is used in templates/config/secret.yaml + extraConfiguration: |- + default_vhost = celery + default_permissions.configure = .* + default_permissions.read = .* + default_permissions.write = .* + resources: + requests: + cpu: "0.1" + memory: 1024Mi + limits: + cpu: "4" + memory: 2048Mi + persistence: + enabled: true + size: 2Gi + storageClass: + api: # Not required if global image are set image: {} From b967f3a29d895dec6700930b40547af6d7d9cd10 Mon Sep 17 00:00:00 2001 From: thenav56 Date: Fri, 4 Apr 2025 15:40:29 +0545 Subject: [PATCH 3/3] Upgrade chart version --- toggle/django-app/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toggle/django-app/Chart.yaml b/toggle/django-app/Chart.yaml index 216c604..17ba4c9 100644 --- a/toggle/django-app/Chart.yaml +++ b/toggle/django-app/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: django-app description: "Helm Chart to deploy the Django application" type: application -version: 0.0.1 +version: 0.1.0 sources: - https://github.com/toggle-corp/charts