From 0b7220424e62404600bd776a260aef3b37930a53 Mon Sep 17 00:00:00 2001 From: netthier Date: Thu, 4 May 2023 18:31:15 +0200 Subject: [PATCH 1/9] feat(flux-kluctl-controller): Allow users to specify additional env variables Signed-off-by: netthier --- charts/flux-kluctl-controller/templates/deployment.yaml | 3 +++ charts/flux-kluctl-controller/values.yaml | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/charts/flux-kluctl-controller/templates/deployment.yaml b/charts/flux-kluctl-controller/templates/deployment.yaml index 98d5c6c..2ed9e2d 100644 --- a/charts/flux-kluctl-controller/templates/deployment.yaml +++ b/charts/flux-kluctl-controller/templates/deployment.yaml @@ -43,6 +43,9 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + {{- with .Values.env }} + {{- toYaml . | nindent 12 }} + {{- end }} args: - --watch-all-namespaces - --log-level=info diff --git a/charts/flux-kluctl-controller/values.yaml b/charts/flux-kluctl-controller/values.yaml index 43ec3d2..7b7eed5 100644 --- a/charts/flux-kluctl-controller/values.yaml +++ b/charts/flux-kluctl-controller/values.yaml @@ -38,6 +38,13 @@ securityContext: seccompProfile: type: RuntimeDefault +# Additional environment variables +env: [] + # - name: HTTPS_PROXY + # value: https://proxy.example.org + # - name: NO_PROXY + # value: 10.96.0.1 + service: type: ClusterIP prometheus: From b5960f1ff1e14f8b8b9ac65217cd5a8da5c62f49 Mon Sep 17 00:00:00 2001 From: netthier Date: Thu, 4 May 2023 18:31:27 +0200 Subject: [PATCH 2/9] feat(template-controller): Allow users to specify additional env variables Signed-off-by: netthier --- charts/template-controller/templates/deployment.yaml | 3 +++ charts/template-controller/values.yaml | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/charts/template-controller/templates/deployment.yaml b/charts/template-controller/templates/deployment.yaml index 429ad2a..95a199c 100644 --- a/charts/template-controller/templates/deployment.yaml +++ b/charts/template-controller/templates/deployment.yaml @@ -35,6 +35,9 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + {{- with .Values.env }} + {{- toYaml . | nindent 12 }} + {{- end }} args: - --watch-all-namespaces - --leader-elect diff --git a/charts/template-controller/values.yaml b/charts/template-controller/values.yaml index 615dbea..b727608 100644 --- a/charts/template-controller/values.yaml +++ b/charts/template-controller/values.yaml @@ -38,6 +38,13 @@ securityContext: seccompProfile: type: RuntimeDefault +# Additional environment variables +env: [] + # - name: HTTPS_PROXY + # value: https://proxy.example.org + # - name: NO_PROXY + # value: 10.96.0.1 + service: type: ClusterIP prometheus: From 20b414d8040e7de53bfa96734b0b7ba2ebca08d4 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 12 May 2023 14:55:33 +0200 Subject: [PATCH 3/9] fix(flux-kluctl-controller): Upgrade flux-kluctl-controller to v0.15.1 --- charts/flux-kluctl-controller/Chart.yaml | 2 +- .../crds/flux.kluctl.io_kluctldeployments.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/flux-kluctl-controller/Chart.yaml b/charts/flux-kluctl-controller/Chart.yaml index 901aa4a..9ed2a39 100644 --- a/charts/flux-kluctl-controller/Chart.yaml +++ b/charts/flux-kluctl-controller/Chart.yaml @@ -10,4 +10,4 @@ maintainers: description: A Helm chart for the flux-kluctl-controller type: application version: 0.2.8 -appVersion: "v0.15.0" +appVersion: "v0.15.1" diff --git a/charts/flux-kluctl-controller/crds/flux.kluctl.io_kluctldeployments.yaml b/charts/flux-kluctl-controller/crds/flux.kluctl.io_kluctldeployments.yaml index 03d5daf..602c611 100644 --- a/charts/flux-kluctl-controller/crds/flux.kluctl.io_kluctldeployments.yaml +++ b/charts/flux-kluctl-controller/crds/flux.kluctl.io_kluctldeployments.yaml @@ -170,7 +170,7 @@ spec: description: 'SecretRef holds the name of a secret that contains the Helm credentials. The secret must either contain the fields `credentialsId` which refers to the credentialsId found in - https://kluctl.io/docs/reference/deployments/helm/#private-chart-repositories + https://kluctl.io/docs/kluctl/reference/deployments/helm/#private-chart-repositories or an `url` used to match the credentials found in Kluctl projects helm-chart.yaml files. The secret can either container basic authentication credentials via `username` and `password` From e631f1d92bfd5842fbf8d3b13f1ad40c4ddd2248 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 12 May 2023 14:57:29 +0200 Subject: [PATCH 4/9] docs(flux-kluctl-controller): Update Readme Signed-off-by: Alexander Block --- charts/flux-kluctl-controller/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/flux-kluctl-controller/README.md b/charts/flux-kluctl-controller/README.md index d85a952..f86eb65 100644 --- a/charts/flux-kluctl-controller/README.md +++ b/charts/flux-kluctl-controller/README.md @@ -1,6 +1,6 @@ # flux-kluctl-controller -![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.0](https://img.shields.io/badge/AppVersion-v0.15.0-informational?style=flat-square) +![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.1](https://img.shields.io/badge/AppVersion-v0.15.1-informational?style=flat-square) A Helm chart for the flux-kluctl-controller @@ -17,6 +17,7 @@ A Helm chart for the flux-kluctl-controller | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | | +| env | list | `[]` | | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"ghcr.io/kluctl/flux-kluctl-controller"` | | From f0e426de45775eaa45c25995705ec19f1abcad12 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 12 May 2023 14:57:29 +0200 Subject: [PATCH 5/9] docs(flux-kluctl-controller): Update Changelog Signed-off-by: Alexander Block --- charts/flux-kluctl-controller/CHANGELOG.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/flux-kluctl-controller/CHANGELOG.md b/charts/flux-kluctl-controller/CHANGELOG.md index 5274469..2981757 100644 --- a/charts/flux-kluctl-controller/CHANGELOG.md +++ b/charts/flux-kluctl-controller/CHANGELOG.md @@ -1,9 +1,21 @@ # Changelog -## [flux-kluctl-controller-Unreleased](https://github.com/kluctl/charts/compare/flux-kluctl-controller-0.2.7...HEAD) (2023-03-06) +## [flux-kluctl-controller-Unreleased](https://github.com/kluctl/charts/compare/flux-kluctl-controller-0.2.8...HEAD) (2023-05-12) + +### Features + +* **flux-kluctl-controller:** Allow users to specify additional env variables +([0b72204](https://github.com/kluctl/charts/commit/0b7220424e62404600bd776a260aef3b37930a53)) ### Fixes +* **flux-kluctl-controller:** Upgrade flux-kluctl-controller to v0.15.1 +([20b414d](https://github.com/kluctl/charts/commit/20b414d8040e7de53bfa96734b0b7ba2ebca08d4)) + +### [flux-kluctl-controller-0.2.8](https://github.com/kluctl/charts/compare/flux-kluctl-controller-0.2.7...flux-kluctl-controller-0.2.8) (2023-03-06) + +#### Fixes + * **flux-kluctl-controller:** Upgrade flux-kluctl-controller to 0.15.0 ([da5719e](https://github.com/kluctl/charts/commit/da5719e78f563c39f2425bbe6206482abb8957d9)) From 798e27bfdba182c161debb4a03c9ff20bcd19817 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 12 May 2023 14:57:29 +0200 Subject: [PATCH 6/9] chore(flux-kluctl-controller): Bump chart to Signed-off-by: Alexander Block --- charts/flux-kluctl-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/flux-kluctl-controller/Chart.yaml b/charts/flux-kluctl-controller/Chart.yaml index 9ed2a39..95b8f0d 100644 --- a/charts/flux-kluctl-controller/Chart.yaml +++ b/charts/flux-kluctl-controller/Chart.yaml @@ -9,5 +9,5 @@ maintainers: name: codablock description: A Helm chart for the flux-kluctl-controller type: application -version: 0.2.8 +version: 0.2.9 appVersion: "v0.15.1" From 1b89e89645f78ddd0d04fe5e782f4c8771949c20 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 12 May 2023 14:59:46 +0200 Subject: [PATCH 7/9] docs(template-controller): Update Readme Signed-off-by: Alexander Block --- charts/template-controller/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/template-controller/README.md b/charts/template-controller/README.md index 61c5d92..bd08f52 100644 --- a/charts/template-controller/README.md +++ b/charts/template-controller/README.md @@ -1,6 +1,6 @@ # template-controller -![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.6.0](https://img.shields.io/badge/AppVersion-v0.6.0-informational?style=flat-square) +![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.6.0](https://img.shields.io/badge/AppVersion-v0.6.0-informational?style=flat-square) A Helm chart for the template-controller @@ -17,6 +17,7 @@ A Helm chart for the template-controller | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | | +| env | list | `[]` | | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"ghcr.io/kluctl/template-controller"` | | From b418977a2b10984ec5080a253e3e2b2e869987ac Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 12 May 2023 14:59:46 +0200 Subject: [PATCH 8/9] docs(template-controller): Update Changelog Signed-off-by: Alexander Block --- charts/template-controller/CHANGELOG.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/charts/template-controller/CHANGELOG.md b/charts/template-controller/CHANGELOG.md index e28d807..b1eac78 100644 --- a/charts/template-controller/CHANGELOG.md +++ b/charts/template-controller/CHANGELOG.md @@ -1,11 +1,18 @@ # Changelog -## [template-controller-Unreleased](https://github.com/kluctl/charts/compare/template-controller-0.1.2...HEAD) (2023-01-16) +## [template-controller-Unreleased](https://github.com/kluctl/charts/compare/template-controller-0.2.0...HEAD) (2023-05-12) ### Features -* **template-controller:** Upgrade controller to 0.6.0 -([d5f1859](https://github.com/kluctl/charts/commit/d5f1859fe115033d0a5876ef23fe0ad975fd182b)) +* **template-controller:** Allow users to specify additional env variables +([b5960f1](https://github.com/kluctl/charts/commit/b5960f1ff1e14f8b8b9ac65217cd5a8da5c62f49)) + +## [template-controller-0.2.0](https://github.com/kluctl/charts/compare/template-controller-0.1.2...template-controller-0.2.0) (2023-01-16) + +### Features + +* **template-controller:** Upgrade controller to 0.6.0 (#21) +([325f21e](https://github.com/kluctl/charts/commit/325f21e0088ab0efa7840f9fbb22d4d267be07d5)) ### [template-controller-0.1.2](https://github.com/kluctl/charts/compare/template-controller-0.1.1...template-controller-0.1.2) (2022-12-20) From 0cafda343d2c5e730622a0a33875dfb8a4ee8738 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 12 May 2023 14:59:46 +0200 Subject: [PATCH 9/9] chore(template-controller): Bump chart to Signed-off-by: Alexander Block --- charts/template-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/template-controller/Chart.yaml b/charts/template-controller/Chart.yaml index cea78eb..ea63b61 100644 --- a/charts/template-controller/Chart.yaml +++ b/charts/template-controller/Chart.yaml @@ -9,5 +9,5 @@ maintainers: name: codablock description: A Helm chart for the template-controller type: application -version: 0.2.0 +version: 0.2.1 appVersion: "v0.6.0"