Skip to content

Commit

Permalink
fix(setup): allow credentials to not be set if setup is disabled
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
swiatekm-sumo committed Oct 17, 2022
1 parent e07d609 commit 78c8f5b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand All @@ -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]
Expand Down
4 changes: 3 additions & 1 deletion deploy/helm/sumologic/templates/setup/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.sumologic.setupEnabled }}
{{- if not .Values.sumologic.envFromSecret }}
apiVersion: v1
kind: Secret
Expand All @@ -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 }}

0 comments on commit 78c8f5b

Please sign in to comment.