From 282b6ab11154c2ab9a6c18607c2bf9ea05c19f5c Mon Sep 17 00:00:00 2001 From: Jonas Geiler Date: Wed, 5 Jun 2024 09:46:14 +0200 Subject: [PATCH 1/5] Bump gotenberg from `8.5.1` to `8.6.0`, add HTTPS support --- charts/gotenberg/CHANGELOG.md | 8 ++++++++ charts/gotenberg/Chart.yaml | 4 ++-- charts/gotenberg/README.md | 4 +++- charts/gotenberg/templates/deployment.yaml | 6 ++++++ charts/gotenberg/values.yaml | 4 ++++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index 5be83b3..41972ec 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 1.5.0 + +- Bump `gotenberg` version `8.5.1` -> `8.6.0`. +- Add values for the following flags: + + - `--api-tls-cert-file` + - `--api-tls-key-file` + ## 1.4.0 - Add ability to create and configure `PodDisruptionBudget` (Thanks to Aurel Canciu | [@relu](https://github.com/relu)) diff --git a/charts/gotenberg/Chart.yaml b/charts/gotenberg/Chart.yaml index de968c4..4920fdb 100644 --- a/charts/gotenberg/Chart.yaml +++ b/charts/gotenberg/Chart.yaml @@ -16,13 +16,13 @@ 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.4.0" +version: "1.5.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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "8.5.1" +appVersion: "8.6.0" keywords: - gotenberg diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md index 74d8f74..e2f4987 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.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.5.1](https://img.shields.io/badge/AppVersion-8.5.1-informational?style=flat-square) +![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.6.0](https://img.shields.io/badge/AppVersion-8.6.0-informational?style=flat-square) This is a HELM chart for Gotenberg. @@ -56,6 +56,8 @@ helm upgrade my-release maikumori/gotenberg --install | api.port | int | `3000` | Set the port on which the API should listen (default 3000) | | api.rootPath | string | `""` | Set the root path of the API - for service discovery via URL paths (default "/") | | api.timeout | string | `""` | Set the time limit for requests (default 30s) | +| api.tlsCertFile | string | `""` | Path to the TLS/SSL certificate file - for HTTPS support (default "") | +| api.tlsKeyFile | string | `""` | Path to the TLS/SSL key file - for HTTPS support (default "") | | api.traceHeader | string | `""` | Set the header name to use for identifying requests (default "Gotenberg-Trace") | | autoscaling.enabled | bool | `false` | | | autoscaling.maxReplicas | int | `100` | | diff --git a/charts/gotenberg/templates/deployment.yaml b/charts/gotenberg/templates/deployment.yaml index 2e25459..01671f1 100644 --- a/charts/gotenberg/templates/deployment.yaml +++ b/charts/gotenberg/templates/deployment.yaml @@ -44,6 +44,12 @@ spec: args: - gotenberg - --api-port={{ .Values.api.port }} + {{- if .Values.api.tlsCertFile }} + - --api-tls-cert-file={{ .Values.api.tlsCertFile }} + {{- end }} + {{- if .Values.api.tlsKeyFile }} + - --api-tls-key-file={{ .Values.api.tlsKeyFile }} + {{- end }} {{- if .Values.api.timeout }} - --api-timeout={{ .Values.api.timeout }} {{- end }} diff --git a/charts/gotenberg/values.yaml b/charts/gotenberg/values.yaml index 880b0d1..a857129 100644 --- a/charts/gotenberg/values.yaml +++ b/charts/gotenberg/values.yaml @@ -122,6 +122,10 @@ ingress: api: # -- Set the port on which the API should listen (default 3000) port: 3000 + # -- Path to the TLS/SSL certificate file - for HTTPS support (default "") + tlsCertFile: "" + # -- Path to the TLS/SSL key file - for HTTPS support (default "") + tlsKeyFile: "" # -- Set the time limit for requests (default 30s) timeout: "" # -- Set the root path of the API - for service discovery via URL paths (default "/") From 9e572fa4c717dadf85c17f5e24b7726262aef636 Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Wed, 5 Jun 2024 16:07:58 -0400 Subject: [PATCH 2/5] Add attribution --- charts/gotenberg/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index 41972ec..e9b8a03 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -3,7 +3,7 @@ ## 1.5.0 - Bump `gotenberg` version `8.5.1` -> `8.6.0`. -- Add values for the following flags: +- Add values for the following flags (Thanks to Jonas Geiler | [@jonasgeiler](https://github.com/jonasgeiler)): - `--api-tls-cert-file` - `--api-tls-key-file` From 913e2fd0a5cf57d5f140db3c7e24f07148fb7f6f Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Thu, 13 Jun 2024 09:54:49 -0400 Subject: [PATCH 3/5] Bump gotenberg to `8.7.0` --- charts/gotenberg/CHANGELOG.md | 2 +- charts/gotenberg/Chart.yaml | 2 +- charts/gotenberg/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index e9b8a03..ae145b0 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -2,7 +2,7 @@ ## 1.5.0 -- Bump `gotenberg` version `8.5.1` -> `8.6.0`. +- Bump `gotenberg` version `8.5.1` -> `8.7.0`. - Add values for the following flags (Thanks to Jonas Geiler | [@jonasgeiler](https://github.com/jonasgeiler)): - `--api-tls-cert-file` diff --git a/charts/gotenberg/Chart.yaml b/charts/gotenberg/Chart.yaml index 4920fdb..b1801ce 100644 --- a/charts/gotenberg/Chart.yaml +++ b/charts/gotenberg/Chart.yaml @@ -22,7 +22,7 @@ version: "1.5.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.6.0" +appVersion: "8.7.0" keywords: - gotenberg diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md index e2f4987..9547e94 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.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.6.0](https://img.shields.io/badge/AppVersion-8.6.0-informational?style=flat-square) +![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.7.0](https://img.shields.io/badge/AppVersion-8.7.0-informational?style=flat-square) This is a HELM chart for Gotenberg. From 07aeb1739f95b99faec40645ec5554c07a9f82da Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Fri, 21 Jun 2024 18:23:10 -0400 Subject: [PATCH 4/5] Use K8S TLS secrets for api tls feature --- charts/gotenberg/README.md | 3 +-- charts/gotenberg/templates/deployment.yaml | 18 ++++++++++++++---- charts/gotenberg/values.yaml | 6 ++---- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md index 9547e94..bdaaa0e 100644 --- a/charts/gotenberg/README.md +++ b/charts/gotenberg/README.md @@ -56,8 +56,7 @@ helm upgrade my-release maikumori/gotenberg --install | api.port | int | `3000` | Set the port on which the API should listen (default 3000) | | api.rootPath | string | `""` | Set the root path of the API - for service discovery via URL paths (default "/") | | api.timeout | string | `""` | Set the time limit for requests (default 30s) | -| api.tlsCertFile | string | `""` | Path to the TLS/SSL certificate file - for HTTPS support (default "") | -| api.tlsKeyFile | string | `""` | Path to the TLS/SSL key file - for HTTPS support (default "") | +| api.tlsSecretName | string | `""` | Enables TLS on the API server: K8S TLS secret name containing the TLS certificate and key (tls.crt, tls.key) | | api.traceHeader | string | `""` | Set the header name to use for identifying requests (default "Gotenberg-Trace") | | autoscaling.enabled | bool | `false` | | | autoscaling.maxReplicas | int | `100` | | diff --git a/charts/gotenberg/templates/deployment.yaml b/charts/gotenberg/templates/deployment.yaml index 01671f1..6b38184 100644 --- a/charts/gotenberg/templates/deployment.yaml +++ b/charts/gotenberg/templates/deployment.yaml @@ -44,11 +44,11 @@ spec: args: - gotenberg - --api-port={{ .Values.api.port }} - {{- if .Values.api.tlsCertFile }} - - --api-tls-cert-file={{ .Values.api.tlsCertFile }} + {{- if .Values.api.tlsSecretName }} + - --api-tls-cert-file=/tls/tls.crt {{- end }} - {{- if .Values.api.tlsKeyFile }} - - --api-tls-key-file={{ .Values.api.tlsKeyFile }} + {{- if .Values.api.tlsSecretName }} + - --api-tls-key-file=/tls/tls.key {{- end }} {{- if .Values.api.timeout }} - --api-timeout={{ .Values.api.timeout }} @@ -218,6 +218,11 @@ spec: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: {{- toYaml .Values.volumeMounts | nindent 12 }} + {{- if .Values.api.tlsSecretName }} + - name: tls + mountPath: /tls + readOnly: true + {{- end }} terminationGracePeriodSeconds: {{ .Values.gotenberg.gracefulShutdownDurationSec }} {{- with .Values.nodeSelector }} nodeSelector: @@ -238,4 +243,9 @@ spec: {{- with .Values.volumes }} volumes: {{- toYaml . | nindent 8 }} + {{- if .Values.api.tlsSecretName }} + - name: tls + secret: + secretName: {{ .Values.api.tlsSecretName }} + {{- end }} {{- end }} diff --git a/charts/gotenberg/values.yaml b/charts/gotenberg/values.yaml index a857129..8303dc3 100644 --- a/charts/gotenberg/values.yaml +++ b/charts/gotenberg/values.yaml @@ -122,10 +122,8 @@ ingress: api: # -- Set the port on which the API should listen (default 3000) port: 3000 - # -- Path to the TLS/SSL certificate file - for HTTPS support (default "") - tlsCertFile: "" - # -- Path to the TLS/SSL key file - for HTTPS support (default "") - tlsKeyFile: "" + # -- Enables TLS on the API server: K8S TLS secret name containing the TLS certificate and key (tls.crt, tls.key) + tlsSecretName: "" # -- Set the time limit for requests (default 30s) timeout: "" # -- Set the root path of the API - for service discovery via URL paths (default "/") From fd15a6b15f9d911877ba122c20ec6ff8ed2204e0 Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Fri, 21 Jun 2024 18:24:56 -0400 Subject: [PATCH 5/5] Change wording of CHANGELOG --- charts/gotenberg/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index ae145b0..54cec2d 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -3,7 +3,7 @@ ## 1.5.0 - Bump `gotenberg` version `8.5.1` -> `8.7.0`. -- Add values for the following flags (Thanks to Jonas Geiler | [@jonasgeiler](https://github.com/jonasgeiler)): +- Add support for the following flags (Thanks to Jonas Geiler | [@jonasgeiler](https://github.com/jonasgeiler)): - `--api-tls-cert-file` - `--api-tls-key-file`