From 7b76d9c689311731ec466e866a9768becc772740 Mon Sep 17 00:00:00 2001 From: Anthony SCHWARTZ Date: Mon, 28 Oct 2024 09:07:49 +0100 Subject: [PATCH 1/5] Fixing 'Additional property enabled is not allowed' when using gotenberg in helm dependency --- charts/gotenberg/CHANGELOG.md | 4 ++++ charts/gotenberg/Chart.yaml | 2 +- charts/gotenberg/README.md | 3 ++- charts/gotenberg/values.schema.json | 8 ++++++++ charts/gotenberg/values.yaml | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index 9f011f7..56ea73f 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.9.1 + +- Fixing 'Additional property enabled is not allowed' when using gotenberg in helm dependency + ## 1.9.0 - Add ability to create and configure `networkPolicy` (Thanks to Anthony | [@anthosz](https://github.com/anthosz)) diff --git a/charts/gotenberg/Chart.yaml b/charts/gotenberg/Chart.yaml index f4ac8e3..c623174 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.9.0" +version: "1.9.1" # 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 0cd422a..084a97b 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.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.12.0](https://img.shields.io/badge/AppVersion-8.12.0-informational?style=flat-square) +![Version: 1.9.1](https://img.shields.io/badge/Version-1.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.12.0](https://img.shields.io/badge/AppVersion-8.12.0-informational?style=flat-square) This is a HELM chart for Gotenberg. @@ -145,6 +145,7 @@ helm upgrade my-release maikumori/gotenberg --install | serviceAccount.create | bool | `false` | Specifies whether a service account should be created | | serviceAccount.name | string | `""` | The name of the service account to use. # If not set and create is true, a name is generated using the fullname template | | strategy | object | `{}` | | +| testPodAnnotations | object | `{}` | Set annotations for the helm test pods (for example to disable certain kube-score checks) | | tolerations | list | `[]` | | | topologySpreadConstraints | list | `[]` | | | volumeMounts | list | `[]` | | diff --git a/charts/gotenberg/values.schema.json b/charts/gotenberg/values.schema.json index f1e6717..a3711ec 100644 --- a/charts/gotenberg/values.schema.json +++ b/charts/gotenberg/values.schema.json @@ -5,6 +5,9 @@ "helm-values": { "type": "object", "properties": { + "enabled": { + "$ref": "#/$defs/helm-values.enabled" + }, "affinity": { "$ref": "#/$defs/helm-values.affinity" }, @@ -116,6 +119,11 @@ }, "additionalProperties": false }, + "helm-values.enabled": { + "description": "-- Specifies that chart can be used as a condition when it is a dependency.", + "type": "boolean", + "default": true + }, "helm-values.affinity": { "type": "object", "default": {} diff --git a/charts/gotenberg/values.yaml b/charts/gotenberg/values.yaml index 4251099..fe8f3a9 100644 --- a/charts/gotenberg/values.yaml +++ b/charts/gotenberg/values.yaml @@ -2,6 +2,11 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +# -- Specifies that chart can be used as a condition when it is a dependency. +# See https://helm.sh/docs/chart_best_practices/dependencies/#conditions-and-tags for more info. +# @ignored +enabled: true + replicaCount: 1 image: From f6e31b1b90891cef6b266dddc31048c0b806e31a Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Sun, 24 Nov 2024 09:12:32 -0400 Subject: [PATCH 2/5] Push to container registry --- .github/workflows/release.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1aa2b73..5563c9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,10 @@ on: branches: - master +permissions: + contents: write + packages: write + jobs: release: permissions: @@ -44,3 +48,19 @@ jobs: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" with: config: .cr.yaml + + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Push Charts to GHCR + run: | + for pkg in .cr-release-packages/*; do + if [ -z "${pkg:-}" ]; then + break + fi + helm push "${pkg}" oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/helm-charts + done From fd2d2ca3bee42a15a9d3ef1eb394a0d1c54a566b Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Sun, 24 Nov 2024 09:17:55 -0400 Subject: [PATCH 3/5] Bump gotenberg from `8.12.0` to `8.14.1` --- charts/gotenberg/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gotenberg/Chart.yaml b/charts/gotenberg/Chart.yaml index c623174..2c49da6 100644 --- a/charts/gotenberg/Chart.yaml +++ b/charts/gotenberg/Chart.yaml @@ -22,7 +22,7 @@ version: "1.9.1" # 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.12.0" +appVersion: "8.14.1" keywords: - gotenberg From 5f453dd77408a80ac3672770811561a7c534e826 Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Sun, 24 Nov 2024 09:19:11 -0400 Subject: [PATCH 4/5] Update docs --- charts/gotenberg/CHANGELOG.md | 4 +++- charts/gotenberg/README.md | 2 +- charts/gotenberg/values.schema.json | 16 ++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/charts/gotenberg/CHANGELOG.md b/charts/gotenberg/CHANGELOG.md index 56ea73f..ea82685 100644 --- a/charts/gotenberg/CHANGELOG.md +++ b/charts/gotenberg/CHANGELOG.md @@ -2,7 +2,9 @@ ## 1.9.1 -- Fixing 'Additional property enabled is not allowed' when using gotenberg in helm dependency +- Fixing 'Additional property enabled is not allowed' when using gotenberg in helm dependency (Thanks to Anthony | [@anthosz](https://github.com/anthosz)) +- Bump `gotenberg` version `8.12.0` -> `8.14.1`. +- Publish the chart to OCI registry. ## 1.9.0 diff --git a/charts/gotenberg/README.md b/charts/gotenberg/README.md index 084a97b..191e67b 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.9.1](https://img.shields.io/badge/Version-1.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.12.0](https://img.shields.io/badge/AppVersion-8.12.0-informational?style=flat-square) +![Version: 1.9.1](https://img.shields.io/badge/Version-1.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.14.1](https://img.shields.io/badge/AppVersion-8.14.1-informational?style=flat-square) This is a HELM chart for Gotenberg. diff --git a/charts/gotenberg/values.schema.json b/charts/gotenberg/values.schema.json index a3711ec..e01889c 100644 --- a/charts/gotenberg/values.schema.json +++ b/charts/gotenberg/values.schema.json @@ -5,9 +5,6 @@ "helm-values": { "type": "object", "properties": { - "enabled": { - "$ref": "#/$defs/helm-values.enabled" - }, "affinity": { "$ref": "#/$defs/helm-values.affinity" }, @@ -20,6 +17,9 @@ "chromium": { "$ref": "#/$defs/helm-values.chromium" }, + "enabled": { + "$ref": "#/$defs/helm-values.enabled" + }, "extraEnv": { "$ref": "#/$defs/helm-values.extraEnv" }, @@ -119,11 +119,6 @@ }, "additionalProperties": false }, - "helm-values.enabled": { - "description": "-- Specifies that chart can be used as a condition when it is a dependency.", - "type": "boolean", - "default": true - }, "helm-values.affinity": { "type": "object", "default": {} @@ -423,6 +418,11 @@ "type": "string", "default": "" }, + "helm-values.enabled": { + "description": "-- Specifies that chart can be used as a condition when it is a dependency.\nSee https://helm.sh/docs/chart_best_practices/dependencies/#conditions-and-tags for more info.\n@ignored", + "type": "boolean", + "default": true + }, "helm-values.extraEnv": { "description": "-- List of extra environment variables for gotenberg container", "type": "array", From a8c29e539ae55ed9d43ffd141c6433db06b23107 Mon Sep 17 00:00:00 2001 From: Miks Kalnins Date: Sun, 24 Nov 2024 09:28:04 -0400 Subject: [PATCH 5/5] Fix linting --- .github/workflows/test.yml | 2 +- charts/gotenberg/values.linter.exceptions | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 charts/gotenberg/values.linter.exceptions diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 784de71..dde106b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - name: Run helm-tools run: | pushd charts/gotenberg - helm-tool lint + helm-tool lint -e values.linter.exceptions helm-tool schema | jq . > generated-schema.json CURRENT_SCHEMA=$(cat values.schema.json) GENERATED_SCHEMA=$(cat generated-schema.json) diff --git a/charts/gotenberg/values.linter.exceptions b/charts/gotenberg/values.linter.exceptions new file mode 100644 index 0000000..20ba2a4 --- /dev/null +++ b/charts/gotenberg/values.linter.exceptions @@ -0,0 +1 @@ +value missing from templates: enabled