From b7fcba0c3d1b4af048533937101476f35f52c859 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Thu, 30 Jun 2022 09:21:36 +0200 Subject: [PATCH 1/3] chore: upgrade kubernetes terraform provider to 2.4 Signed-off-by: Dominik Rosiek --- deploy/helm/sumologic/conf/setup/main.tf | 2 +- deploy/helm/sumologic/conf/setup/providers.tf | 2 +- deploy/helm/sumologic/values.yaml | 1 + tests/helm/terraform/static/all_fields.output.yaml | 4 ++-- tests/helm/terraform/static/collector_fields.output.yaml | 4 ++-- tests/helm/terraform/static/conditional_sources.output.yaml | 4 ++-- tests/helm/terraform/static/custom.output.yaml | 4 ++-- tests/helm/terraform/static/default.output.yaml | 4 ++-- .../helm/terraform/static/disable_default_metrics.output.yaml | 4 ++-- tests/helm/terraform/static/disabled_dashboards.output.yaml | 4 ++-- tests/helm/terraform/static/disabled_monitors.output.yaml | 4 ++-- .../static/monitors_with_email_notifications.output.yaml | 4 ++-- .../terraform/static/monitors_with_single_email.output.yaml | 4 ++-- tests/helm/terraform/static/strip_extrapolation.output.yaml | 4 ++-- tests/helm/terraform/static/traces.output.yaml | 4 ++-- 15 files changed, 27 insertions(+), 26 deletions(-) diff --git a/deploy/helm/sumologic/conf/setup/main.tf b/deploy/helm/sumologic/conf/setup/main.tf index 2e01dc5bfb..e4b39d2eba 100644 --- a/deploy/helm/sumologic/conf/setup/main.tf +++ b/deploy/helm/sumologic/conf/setup/main.tf @@ -6,7 +6,7 @@ terraform { } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } diff --git a/deploy/helm/sumologic/conf/setup/providers.tf b/deploy/helm/sumologic/conf/setup/providers.tf index 0951a81b74..0fb8bce118 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 -}} + {{- else if not (eq $key "load_config_file") -}} {{ printf " %-25s" $key }} = {{ include "terraform.print_value" $value }} {{- end }} {{- end }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 85425babc3..07f3733aa9 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -56,6 +56,7 @@ sumologic: # config_context_auth_info: # config_context_cluster: token: "${file(\"/var/run/secrets/kubernetes.io/serviceaccount/token\")}" + ## load_config_file is deprecated and no longer used load_config_file: false # exec: # api_version: diff --git a/tests/helm/terraform/static/all_fields.output.yaml b/tests/helm/terraform/static/all_fields.output.yaml index d50d896abd..23c0baa215 100644 --- a/tests/helm/terraform/static/all_fields.output.yaml +++ b/tests/helm/terraform/static/all_fields.output.yaml @@ -281,7 +281,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -373,7 +373,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/collector_fields.output.yaml b/tests/helm/terraform/static/collector_fields.output.yaml index 79ff894250..e73e05d053 100644 --- a/tests/helm/terraform/static/collector_fields.output.yaml +++ b/tests/helm/terraform/static/collector_fields.output.yaml @@ -280,7 +280,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -372,7 +372,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/conditional_sources.output.yaml b/tests/helm/terraform/static/conditional_sources.output.yaml index 1a23c85d67..0519d58fce 100644 --- a/tests/helm/terraform/static/conditional_sources.output.yaml +++ b/tests/helm/terraform/static/conditional_sources.output.yaml @@ -270,7 +270,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -362,7 +362,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/custom.output.yaml b/tests/helm/terraform/static/custom.output.yaml index 1a23c85d67..0519d58fce 100644 --- a/tests/helm/terraform/static/custom.output.yaml +++ b/tests/helm/terraform/static/custom.output.yaml @@ -270,7 +270,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -362,7 +362,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/default.output.yaml b/tests/helm/terraform/static/default.output.yaml index ef0d9a1468..0115aa3c1b 100644 --- a/tests/helm/terraform/static/default.output.yaml +++ b/tests/helm/terraform/static/default.output.yaml @@ -280,7 +280,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -372,7 +372,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/disable_default_metrics.output.yaml b/tests/helm/terraform/static/disable_default_metrics.output.yaml index e1697ac911..883afb592d 100644 --- a/tests/helm/terraform/static/disable_default_metrics.output.yaml +++ b/tests/helm/terraform/static/disable_default_metrics.output.yaml @@ -279,7 +279,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -371,7 +371,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/disabled_dashboards.output.yaml b/tests/helm/terraform/static/disabled_dashboards.output.yaml index f0f989da58..07487aded9 100644 --- a/tests/helm/terraform/static/disabled_dashboards.output.yaml +++ b/tests/helm/terraform/static/disabled_dashboards.output.yaml @@ -280,7 +280,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -372,7 +372,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/disabled_monitors.output.yaml b/tests/helm/terraform/static/disabled_monitors.output.yaml index fdd39912d4..8108db5b0d 100644 --- a/tests/helm/terraform/static/disabled_monitors.output.yaml +++ b/tests/helm/terraform/static/disabled_monitors.output.yaml @@ -280,7 +280,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -372,7 +372,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml b/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml index faa8347e8b..3223a950dd 100644 --- a/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml +++ b/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml @@ -280,7 +280,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -378,7 +378,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/monitors_with_single_email.output.yaml b/tests/helm/terraform/static/monitors_with_single_email.output.yaml index a0dad022aa..c10c691535 100644 --- a/tests/helm/terraform/static/monitors_with_single_email.output.yaml +++ b/tests/helm/terraform/static/monitors_with_single_email.output.yaml @@ -280,7 +280,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -378,7 +378,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/strip_extrapolation.output.yaml b/tests/helm/terraform/static/strip_extrapolation.output.yaml index 9b0ebabfec..2a7d105244 100644 --- a/tests/helm/terraform/static/strip_extrapolation.output.yaml +++ b/tests/helm/terraform/static/strip_extrapolation.output.yaml @@ -280,7 +280,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -373,7 +373,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") extrapolation = "${file("/var/run/secrets/kubernetes.io/serviceaccount/token")}/${test}" host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/traces.output.yaml b/tests/helm/terraform/static/traces.output.yaml index 0b72c23212..d83b360bec 100644 --- a/tests/helm/terraform/static/traces.output.yaml +++ b/tests/helm/terraform/static/traces.output.yaml @@ -272,7 +272,7 @@ data: } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.13" + version = "~> 2.4" } } } @@ -364,7 +364,7 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - load_config_file = "false" + token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | From 445b199f488e4734559520859d585081a6385d96 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Thu, 30 Jun 2022 09:23:22 +0200 Subject: [PATCH 2/3] chore(changelog): update Signed-off-by: Dominik Rosiek --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45713ef886..b1c583fcc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - chore: update falco chart to 1.18.6 [#2376] - chore: update telegraf-operator chart to 1.3.5 [#2387] - feat: update otellogs to 0.52.0-sumo-0 [#2338][#2338] +- chore: upgrade kubernetes terraform provider to 2.4 [#2397] [#2367]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2367 [#2372]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2372 @@ -27,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2376]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2376 [#2387]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2387 [#2338]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2338 +[#2397]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2397 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.10.0...main ## [v2.10.0] From d612ba651cafc9408d38c5459397e62d5e4bc3b9 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Thu, 30 Jun 2022 17:08:39 +0200 Subject: [PATCH 3/3] feat(terraform): remove load_config_file from configuration Signed-off-by: Dominik Rosiek --- deploy/docs/Terraform.md | 1 - deploy/helm/sumologic/values.yaml | 2 -- tests/helm/terraform/static/all_fields.output.yaml | 1 - tests/helm/terraform/static/collector_fields.output.yaml | 1 - tests/helm/terraform/static/conditional_sources.output.yaml | 1 - tests/helm/terraform/static/custom.output.yaml | 1 - tests/helm/terraform/static/default.output.yaml | 1 - tests/helm/terraform/static/disable_default_metrics.output.yaml | 1 - tests/helm/terraform/static/disabled_dashboards.output.yaml | 1 - tests/helm/terraform/static/disabled_monitors.output.yaml | 1 - .../static/monitors_with_email_notifications.output.yaml | 1 - .../terraform/static/monitors_with_single_email.output.yaml | 1 - tests/helm/terraform/static/strip_extrapolation.input.yaml | 1 - tests/helm/terraform/static/strip_extrapolation.output.yaml | 1 - tests/helm/terraform/static/traces.output.yaml | 1 - 15 files changed, 16 deletions(-) diff --git a/deploy/docs/Terraform.md b/deploy/docs/Terraform.md index d632d8e1f5..2cc81a5cff 100644 --- a/deploy/docs/Terraform.md +++ b/deploy/docs/Terraform.md @@ -34,7 +34,6 @@ sumologic: # config_context_auth_info: # config_context_cluster: token: "${file(\"/var/run/secrets/kubernetes.io/serviceaccount/token\")}" - load_config_file: false # exec: # api_version: # command: diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 07f3733aa9..522f471eda 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -56,8 +56,6 @@ sumologic: # config_context_auth_info: # config_context_cluster: token: "${file(\"/var/run/secrets/kubernetes.io/serviceaccount/token\")}" - ## load_config_file is deprecated and no longer used - load_config_file: false # exec: # api_version: # command: diff --git a/tests/helm/terraform/static/all_fields.output.yaml b/tests/helm/terraform/static/all_fields.output.yaml index 23c0baa215..67b8ce8298 100644 --- a/tests/helm/terraform/static/all_fields.output.yaml +++ b/tests/helm/terraform/static/all_fields.output.yaml @@ -373,7 +373,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/collector_fields.output.yaml b/tests/helm/terraform/static/collector_fields.output.yaml index e73e05d053..f4feb469f4 100644 --- a/tests/helm/terraform/static/collector_fields.output.yaml +++ b/tests/helm/terraform/static/collector_fields.output.yaml @@ -372,7 +372,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/conditional_sources.output.yaml b/tests/helm/terraform/static/conditional_sources.output.yaml index 0519d58fce..a51d095987 100644 --- a/tests/helm/terraform/static/conditional_sources.output.yaml +++ b/tests/helm/terraform/static/conditional_sources.output.yaml @@ -362,7 +362,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/custom.output.yaml b/tests/helm/terraform/static/custom.output.yaml index 0519d58fce..a51d095987 100644 --- a/tests/helm/terraform/static/custom.output.yaml +++ b/tests/helm/terraform/static/custom.output.yaml @@ -362,7 +362,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/default.output.yaml b/tests/helm/terraform/static/default.output.yaml index 0115aa3c1b..6377096dbb 100644 --- a/tests/helm/terraform/static/default.output.yaml +++ b/tests/helm/terraform/static/default.output.yaml @@ -372,7 +372,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/disable_default_metrics.output.yaml b/tests/helm/terraform/static/disable_default_metrics.output.yaml index 883afb592d..b4c9ae3a98 100644 --- a/tests/helm/terraform/static/disable_default_metrics.output.yaml +++ b/tests/helm/terraform/static/disable_default_metrics.output.yaml @@ -371,7 +371,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/disabled_dashboards.output.yaml b/tests/helm/terraform/static/disabled_dashboards.output.yaml index 07487aded9..7752c11147 100644 --- a/tests/helm/terraform/static/disabled_dashboards.output.yaml +++ b/tests/helm/terraform/static/disabled_dashboards.output.yaml @@ -372,7 +372,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/disabled_monitors.output.yaml b/tests/helm/terraform/static/disabled_monitors.output.yaml index 8108db5b0d..a7e6c3099a 100644 --- a/tests/helm/terraform/static/disabled_monitors.output.yaml +++ b/tests/helm/terraform/static/disabled_monitors.output.yaml @@ -372,7 +372,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml b/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml index 3223a950dd..4c98b47515 100644 --- a/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml +++ b/tests/helm/terraform/static/monitors_with_email_notifications.output.yaml @@ -378,7 +378,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/monitors_with_single_email.output.yaml b/tests/helm/terraform/static/monitors_with_single_email.output.yaml index c10c691535..56b062c133 100644 --- a/tests/helm/terraform/static/monitors_with_single_email.output.yaml +++ b/tests/helm/terraform/static/monitors_with_single_email.output.yaml @@ -378,7 +378,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/strip_extrapolation.input.yaml b/tests/helm/terraform/static/strip_extrapolation.input.yaml index ef2c6bd0cc..f44e8400af 100644 --- a/tests/helm/terraform/static/strip_extrapolation.input.yaml +++ b/tests/helm/terraform/static/strip_extrapolation.input.yaml @@ -4,4 +4,3 @@ sumologic: cluster_ca_certificate: "${file(\"/var/run/secrets/kubernetes.io/serviceaccount/ca.crt\")}" token: "${file(\"/var/run/secrets/kubernetes.io/serviceaccount/token\")}" extrapolation: "${file(\"/var/run/secrets/kubernetes.io/serviceaccount/token\")}/${test}" - load_config_file: false diff --git a/tests/helm/terraform/static/strip_extrapolation.output.yaml b/tests/helm/terraform/static/strip_extrapolation.output.yaml index 2a7d105244..33de8b5c13 100644 --- a/tests/helm/terraform/static/strip_extrapolation.output.yaml +++ b/tests/helm/terraform/static/strip_extrapolation.output.yaml @@ -373,7 +373,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") extrapolation = "${file("/var/run/secrets/kubernetes.io/serviceaccount/token")}/${test}" host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: | diff --git a/tests/helm/terraform/static/traces.output.yaml b/tests/helm/terraform/static/traces.output.yaml index d83b360bec..956b7827ce 100644 --- a/tests/helm/terraform/static/traces.output.yaml +++ b/tests/helm/terraform/static/traces.output.yaml @@ -364,7 +364,6 @@ data: cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") host = "https://kubernetes.default.svc" - token = file("/var/run/secrets/kubernetes.io/serviceaccount/token") } resources.tf: |