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

chore: upgrade kubernetes terraform provider to 2.4 #2397

Merged
merged 3 commits into from
Jun 30, 2022
Merged

chore: upgrade kubernetes terraform provider to 2.4 #2397

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7fcba0
chore: upgrade kubernetes terraform provider to 2.4
sumo-drosiek Jun 30, 2022
445b199
chore(changelog): update
sumo-drosiek Jun 30, 2022
d612ba6
feat(terraform): remove load_config_file from configuration
sumo-drosiek Jun 30, 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
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/conf/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
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 -}}
{{- else if not (eq $key "load_config_file") -}}
{{ printf " %-25s" $key }} = {{ include "terraform.print_value" $value }}
{{- end }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove it in 3.0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would just remove this sumologic.cluster.load_config_file property from values.yaml instead of commenting that it doesn't work.

load_config_file: false
# exec:
# api_version:
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/all_fields.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/collector_fields.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/conditional_sources.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/custom.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/default.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/disable_default_metrics.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/disabled_dashboards.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/disabled_monitors.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/monitors_with_email_notifications.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/monitors_with_single_email.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/strip_extrapolation.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/terraform/static/traces.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ data:
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 1.13"
version = "~> 2.4"
}
}
}
Expand Down Expand Up @@ -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: |
Expand Down