From d124e5a3bba3f02304c729ecc168b09689038a86 Mon Sep 17 00:00:00 2001 From: bbk Date: Sun, 9 Jun 2024 11:13:52 +0200 Subject: [PATCH 1/8] order env --- charts/wger/templates/_helpers.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/wger/templates/_helpers.tpl b/charts/wger/templates/_helpers.tpl index 9f675e9..1fc8b4a 100644 --- a/charts/wger/templates/_helpers.tpl +++ b/charts/wger/templates/_helpers.tpl @@ -36,7 +36,7 @@ environment: value: "{{ .Release.Name }}-postgres" - name: DJANGO_DB_PORT value: {{ int .Values.postgres.service.port | quote }} - # django cache + # cache - name: DJANGO_CACHE_BACKEND value: "django_redis.cache.RedisCache" - name: DJANGO_CACHE_LOCATION @@ -45,6 +45,8 @@ environment: value: "django_redis.client.DefaultClient" - name: DJANGO_CACHE_TIMEOUT value: {{ int .Values.app.django.cache.timeout | default "1296000" | quote }} + - name: EXERCISE_CACHE_TTL + value: "18000" # django general {{- if .Values.ingress.enabled }} - name: SITE_URL @@ -103,8 +105,6 @@ environment: - name: GUNICORN_CMD_ARGS value: "--timeout 240 --workers 4 --worker-class gthread --threads 3 --forwarded-allow-ips * --proxy-protocol True --access-logformat='%(h)s %(l)s %({client-ip}i)s %(l)s %({x-real-ip}i)s %(l)s %({x-forwarded-for}i)s %(l)s %(t)s \"%(r)s\" %(s)s %(b)s \"%(f)s\" \"%(a)s\"' --access-logfile - --error-logfile -" {{- end }} - - name: EXERCISE_CACHE_TTL - value: "18000" # Users won't be able to contribute to exercises if their account age is # lower than this amount in days. - name: MIN_ACCOUNT_AGE_TO_TRUST From 2ba222cf82ebd1abdc114ce7b2732e930bb8175b Mon Sep 17 00:00:00 2001 From: bbk Date: Sun, 9 Jun 2024 11:14:21 +0200 Subject: [PATCH 2/8] update doc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2313e8c..b80c46e 100644 --- a/README.md +++ b/README.md @@ -284,7 +284,7 @@ python3 manage.py axes_reset_username [USERNAME] To temporary disable privacy mode to see the blocked ip in the log you can login to the container and add the following setting: -```bas +```bash echo "AXES_SENSITIVE_PARAMETERS = []" >>settings.py ``` From 73e952ad75810de7010f87eba0c9157fc7286e19 Mon Sep 17 00:00:00 2001 From: bbk Date: Sun, 9 Jun 2024 11:14:59 +0200 Subject: [PATCH 3/8] add missing d.quote --- example/prod_values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/prod_values.yaml b/example/prod_values.yaml index 72ec03e..2694c25 100644 --- a/example/prod_values.yaml +++ b/example/prod_values.yaml @@ -50,7 +50,7 @@ app: - name: FROM_EMAIL value: "fit@example.com" - name: DJANGO_ADMINS - value: "SysAdmin, admin@test.com + value: "SysAdmin, admin@test.com" - name: GUNICORN_CMD_ARGS value: "--timeout 240 --workers 2 --worker-class gthread --threads 3 --forwarded-allow-ips * --proxy-protocol True --access-logformat='%(h)s %(l)s %({client-ip}i)s %(l)s %({x-real-ip}i)s %(l)s %({x-forwarded-for}i)s %(l)s %(t)s \"%(r)s\" %(s)s %(b)s \"%(f)s\" \"%(a)s\"' --access-logfile - --error-logfile -" From 04a46230a462bdfd349ebafcb3346eb92f8a4b4e Mon Sep 17 00:00:00 2001 From: bbk Date: Fri, 21 Jun 2024 08:35:35 +0200 Subject: [PATCH 4/8] fix celery redis password --- charts/wger/Chart.yaml | 2 +- charts/wger/templates/deployment.yaml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/charts/wger/Chart.yaml b/charts/wger/Chart.yaml index 0b55cad..4c5ce8e 100644 --- a/charts/wger/Chart.yaml +++ b/charts/wger/Chart.yaml @@ -1,6 +1,6 @@ --- apiVersion: v2 -version: 0.2.0 +version: 0.2.1-rc.1 appVersion: latest name: wger description: A Helm chart for Wger installation on Kubernetes diff --git a/charts/wger/templates/deployment.yaml b/charts/wger/templates/deployment.yaml index 884251b..3521503 100644 --- a/charts/wger/templates/deployment.yaml +++ b/charts/wger/templates/deployment.yaml @@ -74,6 +74,10 @@ spec: secretKeyRef: name: "redis" key: "redis-password" + - name: CELERY_BROKER + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -245,6 +249,10 @@ spec: secretKeyRef: name: "redis" key: "redis-password" + - name: CELERY_BROKER + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -305,6 +313,10 @@ spec: secretKeyRef: name: "redis" key: "redis-password" + - name: CELERY_BROKER + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} - name: CELERY_FLOWER_PASSWORD valueFrom: @@ -426,6 +438,10 @@ spec: secretKeyRef: name: "redis" key: "redis-password" + - name: CELERY_BROKER + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD From c7a515778bae73a056651e49ddfbed6987102fc1 Mon Sep 17 00:00:00 2001 From: bbk Date: Fri, 21 Jun 2024 08:50:20 +0200 Subject: [PATCH 5/8] redis password --- charts/wger/templates/deployment.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/wger/templates/deployment.yaml b/charts/wger/templates/deployment.yaml index 3521503..60c25a7 100644 --- a/charts/wger/templates/deployment.yaml +++ b/charts/wger/templates/deployment.yaml @@ -75,9 +75,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -250,9 +250,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -314,9 +314,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} - name: CELERY_FLOWER_PASSWORD valueFrom: @@ -439,9 +439,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD From 8ea0a307ce8ff4103ef67f912719e7e172fe9afd Mon Sep 17 00:00:00 2001 From: bbk Date: Fri, 21 Jun 2024 09:00:23 +0200 Subject: [PATCH 6/8] redis password --- charts/wger/templates/_helpers.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/wger/templates/_helpers.tpl b/charts/wger/templates/_helpers.tpl index 1fc8b4a..72275e7 100644 --- a/charts/wger/templates/_helpers.tpl +++ b/charts/wger/templates/_helpers.tpl @@ -135,11 +135,13 @@ environment: value: {{ .Values.celery.syncVideos | default "True" | quote }} - name: DOWNLOAD_INGREDIENTS_FROM value: {{ .Values.celery.ingredientsFrom | default "WGER" | quote }} + {{- if not .Values.redis.auth.enabled }} - name: CELERY_BROKER value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} + {{- end }} {{- end }} {{/* From 92f2e31191c0ae25abf8e94b49fb055c9e6a47bb Mon Sep 17 00:00:00 2001 From: bbk Date: Fri, 21 Jun 2024 09:21:08 +0200 Subject: [PATCH 7/8] redis password --- charts/wger/templates/deployment.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/wger/templates/deployment.yaml b/charts/wger/templates/deployment.yaml index 60c25a7..3ce690f 100644 --- a/charts/wger/templates/deployment.yaml +++ b/charts/wger/templates/deployment.yaml @@ -75,9 +75,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -250,9 +250,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -314,9 +314,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} - name: CELERY_FLOWER_PASSWORD valueFrom: @@ -439,9 +439,9 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD From 4ba372b96263f3383f92a369a5c3fcf0c252784e Mon Sep 17 00:00:00 2001 From: bbk Date: Fri, 21 Jun 2024 09:30:26 +0200 Subject: [PATCH 8/8] redis password --- charts/wger/templates/_helpers.tpl | 6 ----- charts/wger/templates/deployment.yaml | 36 +++++++++++++++++++++------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/charts/wger/templates/_helpers.tpl b/charts/wger/templates/_helpers.tpl index 72275e7..96a41df 100644 --- a/charts/wger/templates/_helpers.tpl +++ b/charts/wger/templates/_helpers.tpl @@ -135,12 +135,6 @@ environment: value: {{ .Values.celery.syncVideos | default "True" | quote }} - name: DOWNLOAD_INGREDIENTS_FROM value: {{ .Values.celery.ingredientsFrom | default "WGER" | quote }} - {{- if not .Values.redis.auth.enabled }} - - name: CELERY_BROKER - value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - - name: CELERY_BACKEND - value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - {{- end }} {{- end }} {{- end }} diff --git a/charts/wger/templates/deployment.yaml b/charts/wger/templates/deployment.yaml index 3ce690f..e65719c 100644 --- a/charts/wger/templates/deployment.yaml +++ b/charts/wger/templates/deployment.yaml @@ -75,9 +75,14 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + {{- else }} + - name: CELERY_BROKER + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -250,9 +255,14 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + {{- else }} + - name: CELERY_BROKER + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD @@ -314,9 +324,14 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + {{- else }} + - name: CELERY_BROKER + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} - name: CELERY_FLOWER_PASSWORD valueFrom: @@ -439,9 +454,14 @@ spec: name: "redis" key: "redis-password" - name: CELERY_BROKER - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + - name: CELERY_BACKEND + value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + {{- else }} + - name: CELERY_BROKER + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" - name: CELERY_BACKEND - value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" + value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2" {{- end }} {{- if .Values.celery.flower.enabled }} - name: CELERY_FLOWER_PASSWORD