From f2d4f5bbde59637fdea15a211306e0ea38fd65af Mon Sep 17 00:00:00 2001 From: Paul de Nonancourt Date: Mon, 5 Aug 2024 17:07:13 +0200 Subject: [PATCH 1/3] Add extraEnv to values --- charts/gotenberg/CHANGELOG.md | 4 ++++ charts/gotenberg/Chart.yaml | 2 +- charts/gotenberg/README.md | 1 + charts/gotenberg/templates/deployment.yaml | 7 +++++-- charts/gotenberg/values.yaml | 4 ++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index d6979d8..5e3a77e 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.6.0 + +- Add support for `extraEnv` annotations to provide extra environment variables to `gotenberg` container. + ## 1.5.1 - Bump `gotenberg` version `8.7.0` -> `8.8.1`. diff --git a/charts/gotenberg/Chart.yaml b/charts/gotenberg/Chart.yaml index b4ce9a2..aa50ce8 100644 --- a/charts/gotenberg/Chart.yaml +++ b/charts/gotenberg/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: "1.5.1" +version: "1.6.0" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md index fdb5093..0cfe1a6 100644 --- a/charts/gotenberg/README.md +++ b/charts/gotenberg/README.md @@ -79,6 +79,7 @@ helm upgrade my-release maikumori/gotenberg --install | chromium.proxyServer | string | `""` | Set the outbound proxy server; this switch only affects HTTP and HTTPS requests | | chromium.restartAfter | string | `""` | Number of conversions after which Chromium will automatically restart. Set to 0 to disable this feature | | chromium.startTimeout | string | `""` | Maximum duration to wait for Chromium to start or restart | +| extraEnv | list | `[]` | | | fullnameOverride | string | `""` | | | gotenberg.gracefulShutdownDurationSec | int | `30` | Set the graceful shutdown duration (default 30s) | | image.pullPolicy | string | `"IfNotPresent"` | | diff --git a/charts/gotenberg/templates/deployment.yaml b/charts/gotenberg/templates/deployment.yaml index 5b39605..5b47450 100644 --- a/charts/gotenberg/templates/deployment.yaml +++ b/charts/gotenberg/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: {{ .Chart.Name }} - securityContext: + securityContext: {{- include "gotenberg.securityContext" . | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} @@ -88,7 +88,7 @@ spec: - --chromium-deny-list={{ .Values.chromium.denyList }} {{- end }} {{- if .Values.chromium.ignoreCertificateErrors }} - - --chromium-ignore-certificate-errors + - --chromium-ignore-certificate-errors {{- end }} {{- if .Values.chromium.disableWebSecurity }} - --chromium-disable-web-security @@ -202,6 +202,9 @@ spec: - name: GOTENBERG_API_BASIC_AUTH_PASSWORD value: {{ .Values.api.basicAuthPassword }} {{- end }} + {{- with .Values.extraEnv }} + {{- toYaml . | nindent 10 }} + {{- end }} ports: - name: http containerPort: {{ .Values.api.port }} diff --git a/charts/gotenberg/values.yaml b/charts/gotenberg/values.yaml index 8303dc3..d4067af 100644 --- a/charts/gotenberg/values.yaml +++ b/charts/gotenberg/values.yaml @@ -94,6 +94,10 @@ volumeMounts: [] # - name: tmp-volume # mountPath: /tmp +extraEnv: [] +# - name: FOO +# value: bar + ingress: # -- Set to true to enable ingress record generation. WARNING: Gotenberg shouldn't be exposed to the internet. enabled: false From af9aa9ba0db5bdca97e5856263b658254b7bfa0a Mon Sep 17 00:00:00 2001 From: Paul de Nonancourt Date: Mon, 5 Aug 2024 17:39:46 +0200 Subject: [PATCH 2/3] Update documentation --- charts/gotenberg/README.md | 4 ++-- charts/gotenberg/values.yaml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md index 0cfe1a6..5701290 100644 --- a/charts/gotenberg/README.md +++ b/charts/gotenberg/README.md @@ -1,7 +1,7 @@ # Gotenberg [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/gotenberg)](https://artifacthub.io/packages/helm/maikumori/gotenberg) -![Version: 1.5.1](https://img.shields.io/badge/Version-1.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.8.1](https://img.shields.io/badge/AppVersion-8.8.1-informational?style=flat-square) +![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.8.1](https://img.shields.io/badge/AppVersion-8.8.1-informational?style=flat-square) This is a HELM chart for Gotenberg. @@ -79,7 +79,7 @@ helm upgrade my-release maikumori/gotenberg --install | chromium.proxyServer | string | `""` | Set the outbound proxy server; this switch only affects HTTP and HTTPS requests | | chromium.restartAfter | string | `""` | Number of conversions after which Chromium will automatically restart. Set to 0 to disable this feature | | chromium.startTimeout | string | `""` | Maximum duration to wait for Chromium to start or restart | -| extraEnv | list | `[]` | | +| extraEnv | list | `[]` | List of extra environment variables for gotenberg container | | fullnameOverride | string | `""` | | | gotenberg.gracefulShutdownDurationSec | int | `30` | Set the graceful shutdown duration (default 30s) | | image.pullPolicy | string | `"IfNotPresent"` | | diff --git a/charts/gotenberg/values.yaml b/charts/gotenberg/values.yaml index d4067af..37e498b 100644 --- a/charts/gotenberg/values.yaml +++ b/charts/gotenberg/values.yaml @@ -94,6 +94,7 @@ volumeMounts: [] # - name: tmp-volume # mountPath: /tmp +# -- List of extra environment variables for gotenberg container extraEnv: [] # - name: FOO # value: bar From 649da8ed6b99e9544819a43d2ca3f68c6c8808ef Mon Sep 17 00:00:00 2001 From: Paul de Nonancourt Date: Mon, 5 Aug 2024 17:43:07 +0200 Subject: [PATCH 3/3] Bump Gotenberg to 8.9.0 --- charts/gotenberg/CHANGELOG.md | 1 + charts/gotenberg/Chart.yaml | 2 +- charts/gotenberg/README.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index 5e3a77e..ca4aa2a 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.6.0 +- Bump `gotenberg` version `8.8.1` -> `8.9.0`. - Add support for `extraEnv` annotations to provide extra environment variables to `gotenberg` container. ## 1.5.1 diff --git a/charts/gotenberg/Chart.yaml b/charts/gotenberg/Chart.yaml index aa50ce8..3aa92f9 100644 --- a/charts/gotenberg/Chart.yaml +++ b/charts/gotenberg/Chart.yaml @@ -22,7 +22,7 @@ version: "1.6.0" # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "8.8.1" +appVersion: "8.9.0" keywords: - gotenberg diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md index 5701290..85c0c40 100644 --- a/charts/gotenberg/README.md +++ b/charts/gotenberg/README.md @@ -1,7 +1,7 @@ # Gotenberg [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/gotenberg)](https://artifacthub.io/packages/helm/maikumori/gotenberg) -![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.8.1](https://img.shields.io/badge/AppVersion-8.8.1-informational?style=flat-square) +![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.9.0](https://img.shields.io/badge/AppVersion-8.9.0-informational?style=flat-square) This is a HELM chart for Gotenberg.