From 56b2090d438b4ad6e90301b0f582075007420b39 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Mon, 28 Nov 2022 08:22:15 +0100 Subject: [PATCH 1/2] feat(terraform): expect load_config_file to be not set Signed-off-by: Dominik Rosiek --- deploy/helm/sumologic/conf/setup/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/conf/setup/providers.tf b/deploy/helm/sumologic/conf/setup/providers.tf index 0fb8bce118..0951a81b74 100644 --- a/deploy/helm/sumologic/conf/setup/providers.tf +++ b/deploy/helm/sumologic/conf/setup/providers.tf @@ -19,7 +19,7 @@ provider "kubernetes" { } {{ end }} } - {{- else if not (eq $key "load_config_file") -}} + {{- else -}} {{ printf " %-25s" $key }} = {{ include "terraform.print_value" $value }} {{- end }} {{- end }} From b7703962aeec1e9239d1ac1145c128adccaf8d37 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Mon, 28 Nov 2022 09:09:32 +0100 Subject: [PATCH 2/2] chore: docs Signed-off-by: Dominik Rosiek --- CHANGELOG.md | 2 ++ docs/v3-migration-doc.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4fc877fdb..92a4e6998e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - feat(logs)!: simplify metadata configuration [#2626] - feat(metrics)!: simplify metadata configuration [#2622] - feat(events)!: add config.merge option [#2643] +- feat(terraform)!: expect load_config_file to be not set [#2648] ### Changed @@ -85,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2626]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2626 [#2622]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2622 [#2643]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2643 +[#2648]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2648 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main [telegraf_operator_comapare_1.3.5_and_1.3.10]: https://github.com/influxdata/helm-charts/compare/telegraf-operator-1.3.5...telegraf-operator-1.3.10 [cert-manager-1.4]: https://github.com/cert-manager/cert-manager/releases/tag/v1.4.0 diff --git a/docs/v3-migration-doc.md b/docs/v3-migration-doc.md index 7d64263253..16c622b85b 100644 --- a/docs/v3-migration-doc.md +++ b/docs/v3-migration-doc.md @@ -30,6 +30,8 @@ In this document we detail the changes as well as the exact steps for migration. Removed explicit configuration for otelcol under `metadata.metrics.config`. Added option to merge configuration under `metadata.metrics.config.merge` or overwrite default configuration `metadata.metrics.config.override` +- Removing support for `sumologic.cluster.load_config_file`. + Leaving this configuration will result in setup job failure. ## How to upgrade