From 78c8f5b9c39fc5fdf445d5dab8cbe610cdc0a6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Mon, 17 Oct 2022 14:24:35 +0200 Subject: [PATCH] fix(setup): allow credentials to not be set if setup is disabled A recent change moved setup credentials to a temporary Secret, but failed to make this Secret conditional on setup being enabled. As a result, it's necessary to provide credentials even if setup is disabled, which is incorrect. --- CHANGELOG.md | 2 ++ deploy/helm/sumologic/templates/setup/secret.yaml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 920e99dd1e..f4109a72ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Breaking Changes +- fix(setup):allow credentials to not be set if setup is disabled [#2572] - fix(logs): prevent Fluent Bit from doing metadata enrichment [#2512] - chore(kube-prometheus-stack): update kube-prometheus-stack chart to 39.11.0 [#2446] @@ -33,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2544]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2544 [#2554]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2554 [#2549]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2549 +[#2572]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2572 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main ## [v2.17.0] diff --git a/deploy/helm/sumologic/templates/setup/secret.yaml b/deploy/helm/sumologic/templates/setup/secret.yaml index bf2b9ad993..797e7ea2dc 100644 --- a/deploy/helm/sumologic/templates/setup/secret.yaml +++ b/deploy/helm/sumologic/templates/setup/secret.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sumologic.setupEnabled }} {{- if not .Values.sumologic.envFromSecret }} apiVersion: v1 kind: Secret @@ -11,4 +12,5 @@ metadata: data: SUMOLOGIC_ACCESSID: {{ required "A valid .Values.sumologic.accessId entry required!" .Values.sumologic.accessId | b64enc }} SUMOLOGIC_ACCESSKEY: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.accessKey | b64enc }} -{{ end }} +{{- end }} +{{- end }}