From a1f82e5fa9b6208fed8d73862c79de1d3d2ef320 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:17:05 +0100 Subject: [PATCH 01/27] add support for environment variables helper supports key:value and valueFrom maps Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/templates/_helpers.tpl | 39 ++++++++++++++++--- .../templates/remotecv-deployment.yaml | 4 ++ .../thumbor/templates/thumbor-deployment.yaml | 4 ++ charts/thumbor/values.yaml | 16 ++++++-- 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/charts/thumbor/templates/_helpers.tpl b/charts/thumbor/templates/_helpers.tpl index 88c7f94..0b954fc 100644 --- a/charts/thumbor/templates/_helpers.tpl +++ b/charts/thumbor/templates/_helpers.tpl @@ -54,9 +54,36 @@ Create the name of the service account to use */}} {{- define "thumbor.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "common.names.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} + {{- if .Values.serviceAccount.create -}} + {{- default (include "common.names.fullname" .) .Values.serviceAccount.name -}} + {{- else -}} + {{- default "default" .Values.serviceAccount.name -}} + {{- end -}} +{{- end -}} + +{{/* +Convert Key:Value to correct env var format +*/}} +{{- define "thumbor.envVars" -}} + {{- with .Values.env -}} + # create a empty resulsts list + {{- $result := list -}} + # loop over .Values.env with $key and $value + {{- range $key, $value := . -}} + # If value is a map it probably will be valueFrom + {{- if kindIs "map" $value -}} + # make sure it is realy a valueFrom a secret + {{- if hasKey $value "valueFrom" -}} + # append results list with the corret valueFrom format + {{- $result = append $result (dict "name" $key "valueFrom" $value.valueFrom) -}} + {{- end -}} + {{- else -}} + # if it is not a map, convert the value to string and append the results + # with the expected env var dict + {{- $result = append $result (dict "name" $key "value" ($value | toString)) -}} + {{- end -}} + {{- end -}} + # return result array as yaml dict under the key 'env' + {{- toYaml (dict "env" $result) | nindent 0 -}} + {{- end -}} +{{- end -}} diff --git a/charts/thumbor/templates/remotecv-deployment.yaml b/charts/thumbor/templates/remotecv-deployment.yaml index 394d665..0606b3c 100644 --- a/charts/thumbor/templates/remotecv-deployment.yaml +++ b/charts/thumbor/templates/remotecv-deployment.yaml @@ -46,6 +46,10 @@ spec: - --port=6379 - --with-healthcheck - --server-port=8080 + {{- with .Values.remotecv.env }} + env: + {{- get (fromYaml (include "thumbor.envVars" $)) "env" | toYaml | nindent 12 -}} + {{- end }} ports: - name: http containerPort: 8080 diff --git a/charts/thumbor/templates/thumbor-deployment.yaml b/charts/thumbor/templates/thumbor-deployment.yaml index e77ebce..cb552d9 100644 --- a/charts/thumbor/templates/thumbor-deployment.yaml +++ b/charts/thumbor/templates/thumbor-deployment.yaml @@ -46,6 +46,10 @@ spec: - --use-environment=true - -d - -l=debug + {{- with .Values.env }} + env: + {{- get (fromYaml (include "thumbor.envVars" $)) "env" | toYaml | nindent 12 -}} + {{- end }} ports: - name: http containerPort: 8888 diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml index 4ae8690..fe2228c 100644 --- a/charts/thumbor/values.yaml +++ b/charts/thumbor/values.yaml @@ -13,7 +13,7 @@ fullnameOverride: "" serviceAccount: # Specifies whether a service account should be created - create: true + create: false # Annotations to add to the service account annotations: {} # The name of the service account to use. @@ -26,8 +26,17 @@ podSecurityContext: {} # fsGroup: 2000 -securityContext: - {} +# env: {} + # key: value + +env: + ELASTICSEARCH_PASSWORD: + valueFrom: + secretKeyRef: + name: dd-elastic + key: password + +securityContext: {} # capabilities: # drop: # - ALL @@ -108,6 +117,7 @@ remotecv: maxReplicas: 100 targetCPUUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80 + image: # Overrides the image repository: ghcr.io/thumbor/remotecv From 53553319383d6040de39b2d3b332b7ac92cbabf9 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:51:39 +0100 Subject: [PATCH 02/27] improve env support - make helper use relativ structure - add workaround for env vars. thumbor remotecv for some reason does not use the supplied env variables. They need to be commandline switches - change debug level to warning Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/templates/_helpers.tpl | 34 ++++++++-------- .../templates/remotecv-deployment.yaml | 14 ++++--- .../thumbor/templates/thumbor-deployment.yaml | 6 +-- charts/thumbor/values.yaml | 39 ++++++++++++------- 4 files changed, 53 insertions(+), 40 deletions(-) diff --git a/charts/thumbor/templates/_helpers.tpl b/charts/thumbor/templates/_helpers.tpl index 0b954fc..92e422e 100644 --- a/charts/thumbor/templates/_helpers.tpl +++ b/charts/thumbor/templates/_helpers.tpl @@ -65,25 +65,23 @@ Create the name of the service account to use Convert Key:Value to correct env var format */}} {{- define "thumbor.envVars" -}} - {{- with .Values.env -}} - # create a empty resulsts list - {{- $result := list -}} - # loop over .Values.env with $key and $value - {{- range $key, $value := . -}} - # If value is a map it probably will be valueFrom - {{- if kindIs "map" $value -}} - # make sure it is realy a valueFrom a secret - {{- if hasKey $value "valueFrom" -}} - # append results list with the corret valueFrom format - {{- $result = append $result (dict "name" $key "valueFrom" $value.valueFrom) -}} - {{- end -}} - {{- else -}} - # if it is not a map, convert the value to string and append the results - # with the expected env var dict - {{- $result = append $result (dict "name" $key "value" ($value | toString)) -}} + # create a empty resulsts list + {{- $result := list -}} + # loop over .Values.env with $key and $value + {{- range $key, $value := . -}} + # If value is a map it probably will be valueFrom + {{- if kindIs "map" $value -}} + # make sure it is realy a valueFrom a secret + {{- if hasKey $value "valueFrom" -}} + # append results list with the corret valueFrom format + {{- $result = append $result (dict "name" $key "valueFrom" $value.valueFrom) -}} {{- end -}} + {{- else -}} + # if it is not a map, convert the value to string and append the results + # with the expected env var dict + {{- $result = append $result (dict "name" $key "value" ($value | toString)) -}} {{- end -}} - # return result array as yaml dict under the key 'env' - {{- toYaml (dict "env" $result) | nindent 0 -}} {{- end -}} + # return result array as yaml dict under the key 'env' + {{- toYaml (dict "env" $result) | nindent 0 -}} {{- end -}} diff --git a/charts/thumbor/templates/remotecv-deployment.yaml b/charts/thumbor/templates/remotecv-deployment.yaml index 0606b3c..123abd6 100644 --- a/charts/thumbor/templates/remotecv-deployment.yaml +++ b/charts/thumbor/templates/remotecv-deployment.yaml @@ -41,14 +41,18 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.remotecv.image.repository }}:{{ .Values.remotecv.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.remotecv.image.pullPolicy }} + # workaround, because normal env are not correctly read + # @see https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#use-environment-variables-to-define-arguments args: - - --host=thumbor-redis-master - - --port=6379 - - --with-healthcheck - - --server-port=8080 + - "--host=$(REDIS_HOST)" + - "--port=$(REDIS_PORT)" + - "--with-healthcheck" + - "--server-port=$(HTTP_SERVER_PORT)" + - "--password=$(REDIS_PASSWORD)" + - "-l=warning" {{- with .Values.remotecv.env }} env: - {{- get (fromYaml (include "thumbor.envVars" $)) "env" | toYaml | nindent 12 -}} + {{- get (fromYaml (include "thumbor.envVars" .)) "env" | toYaml | nindent 12 -}} {{- end }} ports: - name: http diff --git a/charts/thumbor/templates/thumbor-deployment.yaml b/charts/thumbor/templates/thumbor-deployment.yaml index cb552d9..456be2c 100644 --- a/charts/thumbor/templates/thumbor-deployment.yaml +++ b/charts/thumbor/templates/thumbor-deployment.yaml @@ -30,7 +30,7 @@ spec: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }} {{- end }} spec: - {{- include "common.images.renderPullSecrets" (dict "value" .Values.image "context" $) | nindent 6 }} + {{- include "common.images.renderPullSecrets" (dict "value" .Values.image "context" $) | nindent 6 -}} serviceAccountName: {{ include "thumbor.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} @@ -45,10 +45,10 @@ spec: - --keyfile=/conf/thumbor/thumbor.key - --use-environment=true - -d - - -l=debug + - -l=warning {{- with .Values.env }} env: - {{- get (fromYaml (include "thumbor.envVars" $)) "env" | toYaml | nindent 12 -}} + {{- get (fromYaml (include "thumbor.envVars" .)) "env" | toYaml | nindent 12 -}} {{- end }} ports: - name: http diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml index fe2228c..37d700d 100644 --- a/charts/thumbor/values.yaml +++ b/charts/thumbor/values.yaml @@ -22,19 +22,17 @@ serviceAccount: podAnnotations: {} -podSecurityContext: - {} +podSecurityContext: {} # fsGroup: 2000 -# env: {} - # key: value -env: - ELASTICSEARCH_PASSWORD: - valueFrom: - secretKeyRef: - name: dd-elastic - key: password +env: {} + # SOME_KEY: SOME_VALUE + # SOME_PASSWORD: + # valueFrom: + # secretKeyRef: + # name: mysecret + # key: password securityContext: {} # capabilities: @@ -65,8 +63,7 @@ ingress: # hosts: # - chart-example.local -resources: - {} +resources: {} # limits: # cpu: 100m # memory: 128Mi @@ -111,6 +108,21 @@ remotecv: podAnnotations: {} + env: + HTTP_SERVER_PORT: "8080" + WITH_HEALTHCHECK: "1" + # this value needs to be adjusted, + # if the release is not called thumbor + REDIS_HOST: "thumbor-redis-master" + REDIS_PORT: "6379" + REDIS_PASSWORD: + valueFrom: + secretKeyRef: + # this value also needs to be adjusted + # if the release name changes + name: thumbor-redis + key: redis-password + autoscaling: enabled: false minReplicas: 1 @@ -124,8 +136,7 @@ remotecv: pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "3-py-3.11" - resources: - {} + resources: {} # limits: # cpu: 100m # memory: 128Mi From 6299a2132c4b7742454568d61197e1720a1842e2 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:07:20 +0100 Subject: [PATCH 03/27] fix markdown syntax errors Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- README.md | 7 ++++++- charts/thumbor/README.md | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fc5dab5..65b9005 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,21 @@ +# Thumbor Helm Chart + ## ⚠️ Warning + This project is still under development. At the moment, we don't recommend usage in production. ## 🌈 Goal + This project aims to provide easy-to-use Helm charts for [Thumbor](https://github.com/thumbor/thumbor) and its components. Currently, the only Helm chart available is for a vanilla Thumbor deployment. ## ⚙️ Usage + ```bash helm repo add thumbor https://thumbor.github.io/helm helm install thumbor thumbor/thumbor ``` You can find the chart documentation under the chart folder: -- [Thumbor](https://github.com/thumbor/helm/tree/main/charts/thumbor) +- [Thumbor](https://github.com/thumbor/helm/tree/main/charts/thumbor) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index 6f74ff8..c79d667 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -2,7 +2,7 @@ ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) -Thumbor(https://github.com/thumbor/thumbor) Helm chart. +Thumbor() Helm chart. **Homepage:** @@ -20,10 +20,11 @@ Thumbor(https://github.com/thumbor/thumbor) Helm chart. | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | common | 2.x.x | -| https://charts.bitnami.com/bitnami | redis | 17.3.x | +| | common | 2.x.x | +| | redis | 17.3.x | ## ⚙️ Usage + ```bash helm repo add thumbor https://thumbor.github.io/helm helm install thumbor thumbor/thumbor From 291e8fed21a3567bbddd12d0716037568719251b Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:39:14 +0100 Subject: [PATCH 04/27] split config and key and fix redis remotecv deps - move thumbor config in a confimag - update dependcies - thumbor remotecv and redis need each other. If no remotecv why install redis. So make redis dependend on remotecv - for small deployments a replicated redis is not needed: no redis replicas by default - minimize thumbor_config variable Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.lock | 8 +++---- charts/thumbor/Chart.yaml | 2 +- charts/thumbor/templates/configmap.yaml | 14 +++++++++++++ .../templates/remotecv-deployment.yaml | 2 +- charts/thumbor/templates/secret.yaml | 8 +------ .../thumbor/templates/thumbor-deployment.yaml | 21 +++++++++++++++++-- charts/thumbor/values.yaml | 13 ++++++------ 7 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 charts/thumbor/templates/configmap.yaml diff --git a/charts/thumbor/Chart.lock b/charts/thumbor/Chart.lock index f56d9d8..6fb3886 100644 --- a/charts/thumbor/Chart.lock +++ b/charts/thumbor/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 2.2.1 + version: 2.14.1 - name: redis repository: https://charts.bitnami.com/bitnami - version: 17.3.14 -digest: sha256:5202ce038c813cc0d94a3d72fd59dd855852f55040002a5fae51115c81a00893 -generated: "2022-12-12T01:28:53.673294+01:00" + version: 17.3.18 +digest: sha256:f328851324e68e5b7c171e543313f2c4d8a28c966657c2b05c984893cc45739e +generated: "2024-02-12T17:39:01.256040449+01:00" diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index 2b0036d..fd28a5c 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -18,4 +18,4 @@ dependencies: - name: redis version: 17.3.x repository: https://charts.bitnami.com/bitnami - condition: thumbor_config.queued_detector.enable_redis + condition: remotecv.enabled diff --git a/charts/thumbor/templates/configmap.yaml b/charts/thumbor/templates/configmap.yaml new file mode 100644 index 0000000..cb800db --- /dev/null +++ b/charts/thumbor/templates/configmap.yaml @@ -0,0 +1,14 @@ +{{- if .Values.thumbor_config }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} +data: + thumbor.conf: |- + {{- include "common.tplvalues.render" (dict "value" .Values.thumbor_config "context" $) | nindent 4 }} +{{- end }} diff --git a/charts/thumbor/templates/remotecv-deployment.yaml b/charts/thumbor/templates/remotecv-deployment.yaml index 123abd6..09ca6bd 100644 --- a/charts/thumbor/templates/remotecv-deployment.yaml +++ b/charts/thumbor/templates/remotecv-deployment.yaml @@ -1,4 +1,4 @@ -{{- if .Values.thumbor_config.queued_detector.enabled }} +{{- if .Values.remotecv.enabled }} apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} kind: Deployment metadata: diff --git a/charts/thumbor/templates/secret.yaml b/charts/thumbor/templates/secret.yaml index c7a9bcb..7bd2ba2 100644 --- a/charts/thumbor/templates/secret.yaml +++ b/charts/thumbor/templates/secret.yaml @@ -1,4 +1,4 @@ -{{- if or .Values.thumbor_config .Values.thumbor_key.manage }} +{{- if .Values.thumbor_key.manage }} apiVersion: v1 kind: Secret metadata: @@ -9,11 +9,5 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} data: - {{- if .Values.thumbor_config }} - thumbor.conf: |- - {{- include "common.tplvalues.render" (dict "value" .Values.thumbor_config.content "context" $) | b64enc | nindent 4 }} - {{- end }} - {{- if .Values.thumbor_key.manage }} thumbor.key: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "thumbor.key" "providedValues" (list "thumbor_key.content" ) "context" $) }} - {{- end }} {{- end }} diff --git a/charts/thumbor/templates/thumbor-deployment.yaml b/charts/thumbor/templates/thumbor-deployment.yaml index 456be2c..3ee5f73 100644 --- a/charts/thumbor/templates/thumbor-deployment.yaml +++ b/charts/thumbor/templates/thumbor-deployment.yaml @@ -65,8 +65,16 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: + {{- if .Values.thumbor_config }} - name: thumbor-config - mountPath: /conf/thumbor + mountPath: /conf/thumbor/thumbor.conf + subPath: thumbor.conf + {{- end }} + {{- if .Values.thumbor_key.manage }} + - name: thumbor-key + mountPath: /conf/thumbor/thumbor.key + subPath: thumbor.key + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -79,7 +87,16 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{ if or .Values.thumbor_config .Values.thumbor_key.manage -}} volumes: + {{- if .Values.thumbor_config }} - name: thumbor-config + configMap: + name: {{ include "common.names.fullname" . }} + {{- end }} + {{- if .Values.thumbor_key.manage }} + - name: thumbor-key secret: - secretName: {{ include "common.secrets.name" (dict "existingSecret" .Values.thumbor_config_existing_secret "defaultNameSuffix" "" "context" $) }} + secretName: {{ include "common.secrets.name" (dict "existingSecret" .Values.thumbor_existing_secret "defaultNameSuffix" "" "context" $) }} + {{- end }} + {{- end -}} diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml index 37d700d..940680a 100644 --- a/charts/thumbor/values.yaml +++ b/charts/thumbor/values.yaml @@ -84,15 +84,10 @@ tolerations: [] affinity: {} -thumbor_config: - queued_detector: - enabled: true - enable_redis: true - - content: | +thumbor_config: | AUTO_WEBP = True -thumbor_config_existing_secret: "" +thumbor_existing_secret: "" thumbor_key: manage: true @@ -102,8 +97,12 @@ redis: registry: docker.io repository: redis tag: "7.0" + replica: + replicaCount: 0 remotecv: + enabled: true + replicaCount: 1 podAnnotations: {} From 37d599f84a8c40ec367f9684073ff6b5ac07a09b Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:45:09 +0100 Subject: [PATCH 05/27] add init Container to remotecv to wait for redis - add an initContainer which waits until the configured redis ist accessable - split remotecv and redis installation in two different variables to allow remotecv installation without redis -> This also allows redis installation without remotecv. I have not found a away to check for both variables Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 2 +- .../templates/remotecv-deployment.yaml | 15 ++++++++ charts/thumbor/values.yaml | 34 ++++++++++++++----- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index fd28a5c..e31f941 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -18,4 +18,4 @@ dependencies: - name: redis version: 17.3.x repository: https://charts.bitnami.com/bitnami - condition: remotecv.enabled + condition: remotecv.installRedis diff --git a/charts/thumbor/templates/remotecv-deployment.yaml b/charts/thumbor/templates/remotecv-deployment.yaml index 09ca6bd..1a561bc 100644 --- a/charts/thumbor/templates/remotecv-deployment.yaml +++ b/charts/thumbor/templates/remotecv-deployment.yaml @@ -35,6 +35,21 @@ spec: serviceAccountName: {{ include "thumbor.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} + {{- with .Values.remotecv.env }} + initContainers: + - name: wait-for-redis + image: busybox + command: + - /bin/sh + - -c + - > + while [ $(echo -e "AUTH $REDIS_PASSWORD\r\nPING\r\n" | nc $REDIS_HOST $REDIS_PORT | grep -c "PONG") -ne 1 ]; do + echo "Waiting for Redis..."; + sleep 1; + done + env: + {{- get (fromYaml (include "thumbor.envVars" .)) "env" | toYaml | nindent 12 -}} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml index 940680a..632389d 100644 --- a/charts/thumbor/values.yaml +++ b/charts/thumbor/values.yaml @@ -1,31 +1,36 @@ +# -- how many thumbor pods should be deployed replicaCount: 1 image: - # Overrides the image + # -- Overrides the image repository: ghcr.io/thumbor/thumbor + # -- override pullPolicy for thumbor image pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. + # -- Overrides the image tag whose default is the chart appVersion. tag: "7-py-3.10" +# -- if the used image is not public imagePullSecrets: [] nameOverride: "" fullnameOverride: "" serviceAccount: - # Specifies whether a service account should be created + # -- Specifies whether a service account should be created create: false - # Annotations to add to the service account + # -- Annotations to add to the service account annotations: {} - # The name of the service account to use. + # -- The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: "" +# -- optional pod Annotations podAnnotations: {} +# -- optional podSecurityContext settings podSecurityContext: {} # fsGroup: 2000 - +# -- environment variables for the thumbor pod env: {} # SOME_KEY: SOME_VALUE # SOME_PASSWORD: @@ -34,6 +39,7 @@ env: {} # name: mysecret # key: password +# -- securityContext for the thumbor container securityContext: {} # capabilities: # drop: @@ -42,21 +48,27 @@ securityContext: {} # runAsNonRoot: true # runAsUser: 1000 +# Thumbor service service: + # -- Thumbor service type type: ClusterIP + # -- Thumbor service port thumbor uses container Port 80 port: 80 ingress: + # -- enable ingress enabled: false + # -- specify ingress class or leave blank for the default ingress class className: "" - annotations: - {} + # -- ingress annotations + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - host: chart-example.local paths: - path: / + # -- if errors occure use Prefix pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls @@ -84,9 +96,11 @@ tolerations: [] affinity: {} +# -- configuration file for thumbor thumbor_config: | AUTO_WEBP = True +# -- if you have already an secret with the thumbor key thumbor_existing_secret: "" thumbor_key: @@ -98,11 +112,15 @@ redis: repository: redis tag: "7.0" replica: + # -- increase this option if you need replicas replicaCount: 0 remotecv: enabled: true + # -- set this to false if you want to use an already existing redis server + installRedis: true + replicaCount: 1 podAnnotations: {} From 797cabb90ca05e55609d787602e37e153a380b5d Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Wed, 14 Feb 2024 12:14:57 +0100 Subject: [PATCH 06/27] update README - update values with comments - regenerate README.md - increment Chart version to major version because of the possible breaking changes Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.lock | 6 +- charts/thumbor/Chart.yaml | 2 +- charts/thumbor/README.md | 185 +++++++++++++++++++++++++------------ charts/thumbor/values.yaml | 20 +++- 4 files changed, 149 insertions(+), 64 deletions(-) diff --git a/charts/thumbor/Chart.lock b/charts/thumbor/Chart.lock index 6fb3886..e2b4dc9 100644 --- a/charts/thumbor/Chart.lock +++ b/charts/thumbor/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 2.14.1 + version: 2.15.1 - name: redis repository: https://charts.bitnami.com/bitnami version: 17.3.18 -digest: sha256:f328851324e68e5b7c171e543313f2c4d8a28c966657c2b05c984893cc45739e -generated: "2024-02-12T17:39:01.256040449+01:00" +digest: sha256:f381af6391f3102a77eb1c03c37f22bda229ff17daa5644f4a5dd2a9a9902305 +generated: "2024-02-14T12:14:13.356461414+01:00" diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index e31f941..0ba896b 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application -version: 0.1.0 +version: 1.0.0 appVersion: "7.1.1" home: http://www.thumbor.org/ sources: diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index c79d667..82af958 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -2,7 +2,7 @@ ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) -Thumbor() Helm chart. +Thumbor(https://github.com/thumbor/thumbor) Helm chart. **Homepage:** @@ -20,11 +20,10 @@ Thumbor() Helm chart. | Repository | Name | Version | |------------|------|---------| -| | common | 2.x.x | -| | redis | 17.3.x | +| https://charts.bitnami.com/bitnami | common | 2.x.x | +| https://charts.bitnami.com/bitnami | redis | 17.3.x | ## ⚙️ Usage - ```bash helm repo add thumbor https://thumbor.github.io/helm helm install thumbor thumbor/thumbor @@ -47,7 +46,7 @@ helm install thumbor thumbor/thumbor {} - + define affinities for the thumbor pod autoscaling.enabled @@ -56,7 +55,7 @@ helm install thumbor thumbor/thumbor false - + enable autoscaling via the HorizontalPodAutoscaler for the thumbor deployment Your Cluster needs to support this! autoscaling.maxReplicas @@ -85,6 +84,15 @@ false + + env + object + 
+{}
+
+ + environment variables for the thumbor pod + fullnameOverride string @@ -101,7 +109,7 @@ false "IfNotPresent" - + override pullPolicy for thumbor image image.repository @@ -110,7 +118,7 @@ false "ghcr.io/thumbor/thumbor" - + Overrides the image image.tag @@ -119,7 +127,7 @@ false "7-py-3.10" - + Overrides the image tag whose default is the chart appVersion. imagePullSecrets @@ -128,7 +136,7 @@ false [] - + if the used image is not public ingress.annotations @@ -137,7 +145,7 @@ false {} - + ingress annotations ingress.className @@ -146,7 +154,7 @@ false "" - + specify ingress class or leave blank for the default ingress class ingress.enabled @@ -155,7 +163,7 @@ false false - + enable ingress ingress.hosts[0].host @@ -182,7 +190,7 @@ false "ImplementationSpecific" - + if errors occure use Prefix ingress.tls @@ -209,7 +217,7 @@ false {} - + deploy thumbor to a specific node podAnnotations @@ -218,7 +226,7 @@ false {} - + optional pod Annotations podSecurityContext @@ -227,7 +235,7 @@ false {} - + optional podSecurityContext settings redis.image.registry @@ -256,6 +264,15 @@ false + + redis.replica.replicaCount + int + 
+0
+
+ + increase this option if you need replicas + remotecv.affinity object @@ -263,7 +280,7 @@ false {} - + define affinities for the thumbor remotecv pod remotecv.autoscaling.enabled @@ -272,7 +289,7 @@ false false - + enable autoscaling via the HorizontalPodAutoscaler for the remotecv deployment Your Cluster needs to support this! remotecv.autoscaling.maxReplicas @@ -298,6 +315,69 @@ false 
 80
+ + + + + remotecv.enabled + bool + 
+true
+
+ + + + + remotecv.env.HTTP_SERVER_PORT + string + 
+"8080"
+
+ + + + + remotecv.env.REDIS_HOST + string + 
+"thumbor-redis-master"
+
+ + + + + remotecv.env.REDIS_PASSWORD.valueFrom.secretKeyRef.key + string + 
+"redis-password"
+
+ + + + + remotecv.env.REDIS_PASSWORD.valueFrom.secretKeyRef.name + string + 
+"thumbor-redis"
+
+ + + + + remotecv.env.REDIS_PORT + string + 
+"6379"
+
+ + + + + remotecv.env.WITH_HEALTHCHECK + string + 
+"1"
+
@@ -317,7 +397,7 @@ false "ghcr.io/thumbor/remotecv" - + Overrides the remotecv image remotecv.image.tag @@ -326,7 +406,16 @@ false "3-py-3.11" - + Overrides the image tag whose default is the chart appVersion. + + + remotecv.installRedis + bool + 
+true
+
+ + set this to false if you want to use an already existing redis server remotecv.nodeSelector @@ -335,7 +424,7 @@ false {} - + deploy thumbor remotecv to a specific node remotecv.podAnnotations @@ -344,7 +433,7 @@ false {} - + add podAnnotations tho the thumbor remotecv pod remotecv.replicaCount @@ -353,7 +442,7 @@ false 1 - + how many remotecv pod do you want remotecv.resources @@ -371,7 +460,7 @@ false [] - + define tolerations for the thumbor remotecv pod replicaCount @@ -380,7 +469,7 @@ false 1 - + how many thumbor pods should be deployed resources @@ -398,7 +487,7 @@ false {} - + securityContext for the thumbor container service.port @@ -407,7 +496,7 @@ false 80 - + Thumbor service port thumbor uses container Port 80 service.type @@ -416,7 +505,7 @@ false "ClusterIP" - + Thumbor service type serviceAccount.annotations @@ -425,16 +514,16 @@ false {} - + Annotations to add to the service account serviceAccount.create bool 
-true
+false
- + Specifies whether a service account should be created serviceAccount.name @@ -443,43 +532,25 @@ true "" - + The name of the service account to use. If not set and create is true, a name is generated using the fullname template - thumbor_config.content + thumbor_config string 
 "AUTO_WEBP = True\n"
- - - - thumbor_config.queued_detector.enable_redis - bool - 
-true
-
- - + configuration file for thumbor - thumbor_config.queued_detector.enabled - bool - 
-true
-
- - - - - thumbor_config_existing_secret + thumbor_existing_secret string 
 ""
- + if you have already an secret with the thumbor key thumbor_key.manage @@ -497,10 +568,10 @@ true [] - + define tolerations for the thumbor pod ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0) diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml index 632389d..a9512a3 100644 --- a/charts/thumbor/values.yaml +++ b/charts/thumbor/values.yaml @@ -84,16 +84,21 @@ resources: {} # memory: 128Mi autoscaling: + # -- enable autoscaling via the HorizontalPodAutoscaler for the thumbor deployment + # Your Cluster needs to support this! enabled: false minReplicas: 1 maxReplicas: 100 targetCPUUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80 +# -- deploy thumbor to a specific node nodeSelector: {} +# -- define tolerations for the thumbor pod tolerations: [] +# -- define affinities for the thumbor pod affinity: {} # -- configuration file for thumbor @@ -121,8 +126,10 @@ remotecv: # -- set this to false if you want to use an already existing redis server installRedis: true + # -- how many remotecv pod do you want replicaCount: 1 + # -- add podAnnotations tho the thumbor remotecv pod podAnnotations: {} env: @@ -141,6 +148,8 @@ remotecv: key: redis-password autoscaling: + # -- enable autoscaling via the HorizontalPodAutoscaler for the remotecv deployment + # Your Cluster needs to support this! enabled: false minReplicas: 1 maxReplicas: 100 @@ -148,10 +157,10 @@ remotecv: # targetMemoryUtilizationPercentage: 80 image: - # Overrides the image + # -- Overrides the remotecv image repository: ghcr.io/thumbor/remotecv pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. + # -- Overrides the image tag whose default is the chart appVersion. tag: "3-py-3.11" resources: {} # limits: @@ -160,6 +169,11 @@ remotecv: # requests: # cpu: 100m # memory: 128Mi + # -- deploy thumbor remotecv to a specific node nodeSelector: {} - affinity: {} + + # -- define tolerations for the thumbor remotecv pod tolerations: [] + + # -- define affinities for the thumbor remotecv pod + affinity: {} From 4a0ac4476c3c0137df608b502ceb89dfe80efcb0 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:44:25 +0100 Subject: [PATCH 07/27] update github workflow helm-docs update helm-docs to latest version (1.12.0) Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- .github/workflows/chart-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/chart-docs.yaml b/.github/workflows/chart-docs.yaml index ebc2069..651661f 100644 --- a/.github/workflows/chart-docs.yaml +++ b/.github/workflows/chart-docs.yaml @@ -21,7 +21,7 @@ jobs: - name: Generate Helm Documentation id: helmdocs - run: docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:v1.11.0 + run: docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:v1.12.0 - uses: stefanzweifel/git-auto-commit-action@v4 with: From 248f2269c30a6dd5b8b08873900beefc896a418c Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:20:41 +0100 Subject: [PATCH 08/27] allow manual release --- .github/workflows/chart-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml index 18eb4c5..4b91780 100644 --- a/.github/workflows/chart-release.yaml +++ b/.github/workflows/chart-release.yaml @@ -1,6 +1,7 @@ name: Release Charts on: + workflow_dispatch: push: branches: - main From bf5b696f991f7547b8897f002a4ed1c5c8729a06 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:32:04 +0100 Subject: [PATCH 09/27] support prod branch trigger pipelines on prod branch aswell allow manual pipeline triggers --- .github/workflows/chart-docs.yaml | 4 +++- .github/workflows/chart-release.yaml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/chart-docs.yaml b/.github/workflows/chart-docs.yaml index 651661f..c04512d 100644 --- a/.github/workflows/chart-docs.yaml +++ b/.github/workflows/chart-docs.yaml @@ -1,9 +1,11 @@ name: Update Charts docs on: + workflow_dispatch: push: branches: - - "main" + - main + - prod paths: - "charts/**" diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml index 4b91780..d10e971 100644 --- a/.github/workflows/chart-release.yaml +++ b/.github/workflows/chart-release.yaml @@ -5,6 +5,7 @@ on: push: branches: - main + - prod paths: - "charts/**" From 54e7ffd80f764bd07c553cd3baca1a29353c0642 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Tue, 23 Apr 2024 16:55:18 +0200 Subject: [PATCH 10/27] improve thumbor key handling if thumbor_key.manage was set to false, the --keyfile start flag was not removed. Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 2 +- charts/thumbor/templates/thumbor-deployment.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index 0ba896b..240688b 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application -version: 1.0.0 +version: 1.0.1 appVersion: "7.1.1" home: http://www.thumbor.org/ sources: diff --git a/charts/thumbor/templates/thumbor-deployment.yaml b/charts/thumbor/templates/thumbor-deployment.yaml index 3ee5f73..fdb0bfe 100644 --- a/charts/thumbor/templates/thumbor-deployment.yaml +++ b/charts/thumbor/templates/thumbor-deployment.yaml @@ -42,7 +42,9 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} args: - --conf=/conf/thumbor/thumbor.conf + {{- if .Values.thumbor_key.manage }} - --keyfile=/conf/thumbor/thumbor.key + {{- end }} - --use-environment=true - -d - -l=warning From d3082b934bbb38a76453a01e4f55d595e04294bb Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Tue, 23 Apr 2024 14:58:43 +0000 Subject: [PATCH 11/27] Automated Helm Documentation --- charts/thumbor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index 82af958..c3ce55a 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) +![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart. From d7eca9b87ae0f53872d28ae2264aa75af17b26d4 Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Tue, 23 Apr 2024 15:00:37 +0000 Subject: [PATCH 12/27] Automated Helm Documentation --- charts/thumbor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index 82af958..c3ce55a 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) +![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart. From 7749cd5b245304d72f097eb70a1b24062e0ad6d5 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Mon, 8 Jul 2024 11:37:34 +0200 Subject: [PATCH 13/27] improve thumbor-remotecv initContainer Wait for 10 Seconds and fail afterwards to restart POD. For some reason the lookup just hangs or does simply not succeed, this would mean, that the POD stuck in the init forever. If the POD is killed and deploys new, the connection works directly. Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 2 +- charts/thumbor/templates/remotecv-deployment.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index 240688b..ce73e25 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application -version: 1.0.1 +version: 1.0.2 appVersion: "7.1.1" home: http://www.thumbor.org/ sources: diff --git a/charts/thumbor/templates/remotecv-deployment.yaml b/charts/thumbor/templates/remotecv-deployment.yaml index 1a561bc..5ace485 100644 --- a/charts/thumbor/templates/remotecv-deployment.yaml +++ b/charts/thumbor/templates/remotecv-deployment.yaml @@ -43,9 +43,16 @@ spec: - /bin/sh - -c - > + COUNT=0 while [ $(echo -e "AUTH $REDIS_PASSWORD\r\nPING\r\n" | nc $REDIS_HOST $REDIS_PORT | grep -c "PONG") -ne 1 ]; do + if [[ $COUNT -ge 10 ]]; then + echo "Waited to long restarting POD" + exit 1; + fi + echo "Waiting for Redis..."; sleep 1; + ((COUNT++)) done env: {{- get (fromYaml (include "thumbor.envVars" .)) "env" | toYaml | nindent 12 -}} From fd8c0b189e98b0c05058b5b7429be785d12abe2c Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Mon, 8 Jul 2024 09:40:12 +0000 Subject: [PATCH 14/27] Automated Helm Documentation --- charts/thumbor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index c3ce55a..60d1610 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) +![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart. From bbe9471fce28faee53726f80cf4927b19b8e35f9 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Mon, 8 Jul 2024 11:50:47 +0200 Subject: [PATCH 15/27] revert accidental override of source workflows Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- .github/workflows/chart-docs.yaml | 4 +--- .github/workflows/chart-release.yaml | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/chart-docs.yaml b/.github/workflows/chart-docs.yaml index c04512d..651661f 100644 --- a/.github/workflows/chart-docs.yaml +++ b/.github/workflows/chart-docs.yaml @@ -1,11 +1,9 @@ name: Update Charts docs on: - workflow_dispatch: push: branches: - - main - - prod + - "main" paths: - "charts/**" diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml index d10e971..18eb4c5 100644 --- a/.github/workflows/chart-release.yaml +++ b/.github/workflows/chart-release.yaml @@ -1,11 +1,9 @@ name: Release Charts on: - workflow_dispatch: push: branches: - main - - prod paths: - "charts/**" From 5f7da5f5dccdd5191d97f5da86a853bb2391ea4d Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:05:16 +0200 Subject: [PATCH 16/27] add missing semicolon Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/templates/remotecv-deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/thumbor/templates/remotecv-deployment.yaml b/charts/thumbor/templates/remotecv-deployment.yaml index 5ace485..807bb34 100644 --- a/charts/thumbor/templates/remotecv-deployment.yaml +++ b/charts/thumbor/templates/remotecv-deployment.yaml @@ -43,10 +43,10 @@ spec: - /bin/sh - -c - > - COUNT=0 + COUNT=0; while [ $(echo -e "AUTH $REDIS_PASSWORD\r\nPING\r\n" | nc $REDIS_HOST $REDIS_PORT | grep -c "PONG") -ne 1 ]; do if [[ $COUNT -ge 10 ]]; then - echo "Waited to long restarting POD" + echo "Waited to long restarting POD"; exit 1; fi From d16697e644efe4820118c66cc606815aa231a092 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:07:25 +0200 Subject: [PATCH 17/27] increase Chart version after change Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index ce73e25..990a93b 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application -version: 1.0.2 +version: 1.0.3 appVersion: "7.1.1" home: http://www.thumbor.org/ sources: From 83d5196d503b5f5c89807e3676314a4d7d086cca Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Mon, 8 Jul 2024 13:07:40 +0000 Subject: [PATCH 18/27] Automated Helm Documentation --- charts/thumbor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index 60d1610..1ec1e27 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) +![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart. From 4651ec7dac97a2ad2ecc08298f9fa08f99f134ad Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:48:50 +0100 Subject: [PATCH 19/27] use posix shell complient incrementation syntax Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/templates/remotecv-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/templates/remotecv-deployment.yaml b/charts/thumbor/templates/remotecv-deployment.yaml index 807bb34..e922fb2 100644 --- a/charts/thumbor/templates/remotecv-deployment.yaml +++ b/charts/thumbor/templates/remotecv-deployment.yaml @@ -52,7 +52,7 @@ spec: echo "Waiting for Redis..."; sleep 1; - ((COUNT++)) + COUNT=$((COUNT+1)) done env: {{- get (fromYaml (include "thumbor.envVars" .)) "env" | toYaml | nindent 12 -}} From edf3b1632f8de4fac61b07d9a965cbe00a173fce Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:59:15 +0100 Subject: [PATCH 20/27] increment chart version Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index 990a93b..5eddaaf 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application -version: 1.0.3 +version: 1.0.4 appVersion: "7.1.1" home: http://www.thumbor.org/ sources: From 8557b1f13d82580056884e80dd593288751751a0 Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Tue, 29 Oct 2024 17:59:51 +0000 Subject: [PATCH 21/27] Automated Helm Documentation --- charts/thumbor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index 1ec1e27..d20fa49 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) +![Version: 1.0.4](https://img.shields.io/badge/Version-1.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart. From da9ea93a8e3913df773b5c733adfdc3ce9294fc0 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Tue, 22 Apr 2025 12:06:39 +0200 Subject: [PATCH 22/27] update thumbor to 7.7.5 Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 4 ++-- charts/thumbor/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index 5eddaaf..456583d 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application -version: 1.0.4 -appVersion: "7.1.1" +version: 1.1.0 +appVersion: "7.7.5" home: http://www.thumbor.org/ sources: - https://github.com/thumbor/helm/tree/main/charts/thumbor diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml index a9512a3..0ea368d 100644 --- a/charts/thumbor/values.yaml +++ b/charts/thumbor/values.yaml @@ -7,7 +7,7 @@ image: # -- override pullPolicy for thumbor image pullPolicy: IfNotPresent # -- Overrides the image tag whose default is the chart appVersion. - tag: "7-py-3.10" + tag: "7.7.5-py-3.12" # -- if the used image is not public imagePullSecrets: [] From 0f9329b981fc4daedf8d1970ff6474aa507d85e2 Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Tue, 22 Apr 2025 10:07:03 +0000 Subject: [PATCH 23/27] Automated Helm Documentation --- charts/thumbor/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index d20fa49..3b2d585 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 1.0.4](https://img.shields.io/badge/Version-1.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.1.1](https://img.shields.io/badge/AppVersion-7.1.1-informational?style=flat-square) +![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.7.5](https://img.shields.io/badge/AppVersion-7.7.5-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart. @@ -124,7 +124,7 @@ false image.tag string 
-"7-py-3.10"
+"7.7.5-py-3.12"
Overrides the image tag whose default is the chart appVersion. From ec03b5507ce6e6d80238ff190429a2efeb498241 Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Thu, 20 Nov 2025 10:57:07 +0100 Subject: [PATCH 24/27] upgrade thumbor to 7.7.7 Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 2 +- charts/thumbor/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index 456583d..e51ed53 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -3,7 +3,7 @@ name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application version: 1.1.0 -appVersion: "7.7.5" +appVersion: "7.7.7" home: http://www.thumbor.org/ sources: - https://github.com/thumbor/helm/tree/main/charts/thumbor diff --git a/charts/thumbor/values.yaml b/charts/thumbor/values.yaml index 0ea368d..d925d68 100644 --- a/charts/thumbor/values.yaml +++ b/charts/thumbor/values.yaml @@ -7,7 +7,7 @@ image: # -- override pullPolicy for thumbor image pullPolicy: IfNotPresent # -- Overrides the image tag whose default is the chart appVersion. - tag: "7.7.5-py-3.12" + tag: "7.7.7-py-3.13" # -- if the used image is not public imagePullSecrets: [] From 0d5918b0666c02303e44e446634003922770c0cb Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Thu, 20 Nov 2025 09:57:32 +0000 Subject: [PATCH 25/27] Automated Helm Documentation --- charts/thumbor/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index 3b2d585..a82c498 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.7.5](https://img.shields.io/badge/AppVersion-7.7.5-informational?style=flat-square) +![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.7.7](https://img.shields.io/badge/AppVersion-7.7.7-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart. @@ -124,7 +124,7 @@ false image.tag string 
-"7.7.5-py-3.12"
+"7.7.7-py-3.13"
Overrides the image tag whose default is the chart appVersion. From 2dad567d614875340b2aa8212131186c204bdaca Mon Sep 17 00:00:00 2001 From: Spirit-act <16631523+Spirit-act@users.noreply.github.com> Date: Thu, 20 Nov 2025 10:59:06 +0100 Subject: [PATCH 26/27] forgot to increment chart version Signed-off-by: Spirit-act <16631523+Spirit-act@users.noreply.github.com> --- charts/thumbor/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/Chart.yaml b/charts/thumbor/Chart.yaml index e51ed53..79b3546 100644 --- a/charts/thumbor/Chart.yaml +++ b/charts/thumbor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: thumbor description: Thumbor(https://github.com/thumbor/thumbor) Helm chart. type: application -version: 1.1.0 +version: 1.1.1 appVersion: "7.7.7" home: http://www.thumbor.org/ sources: From f19b8565d5d5889df7e763ebc2b9fce15d397091 Mon Sep 17 00:00:00 2001 From: Spirit-act Date: Thu, 20 Nov 2025 09:59:28 +0000 Subject: [PATCH 27/27] Automated Helm Documentation --- charts/thumbor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/thumbor/README.md b/charts/thumbor/README.md index a82c498..dbe3c35 100644 --- a/charts/thumbor/README.md +++ b/charts/thumbor/README.md @@ -1,6 +1,6 @@ # thumbor -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.7.7](https://img.shields.io/badge/AppVersion-7.7.7-informational?style=flat-square) +![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.7.7](https://img.shields.io/badge/AppVersion-7.7.7-informational?style=flat-square) Thumbor(https://github.com/thumbor/thumbor) Helm chart.