Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(terraform)!: expect load_config_file to be not set #2648

Merged
merged 3 commits into from
Nov 28, 2022
Merged

feat(terraform)!: expect load_config_file to be not set #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56b2090
feat(terraform): expect load_config_file to be not set
sumo-drosiek Nov 28, 2022
b770396
chore: docs
sumo-drosiek Nov 28, 2022
4da8f6e
Merge branch 'main' into drosiek-remove-load-config-file
sumo-drosiek Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
- feat(otellogs)!: add config.merge option [#2652]

### Changed
Expand All @@ -48,7 +49,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- docs: rename user-provided config from values.yaml to user-values.yaml [#2619]
- feat: update opentelemetry-operator chart and fix progagators list in instrumentation resource [#2628]
- feat: drop migration script for v1 [#2654]
- feat: drop migration script for v2 [#2654]

### Fixed

Expand Down Expand Up @@ -88,6 +88,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
[#2654]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2654
[#2652]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2652
[Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/conf/setup/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions docs/v3-migration-doc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down