Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #835 from kinvolk/invidian/terraform-provider-updates
Browse files Browse the repository at this point in the history
Update all Terraform providers to latest versions
  • Loading branch information
invidian authored Aug 25, 2020
2 parents b41e250 + 5ef3e0b commit 8a115b5
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 61 deletions.
12 changes: 6 additions & 6 deletions assets/terraform-modules/aws/flatcar-linux/kubernetes/require.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ terraform {
required_version = ">= 0.12.0"

required_providers {
aws = "2.48.0"
ct = "0.5.0"
local = "~> 1.2"
null = "~> 2.1"
template = "~> 2.1"
tls = "~> 2.0"
aws = "3.3.0"
ct = "0.6.1"
local = "1.4.0"
null = "2.1.2"
template = "2.1.2"
tls = "2.2.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ terraform {
required_version = ">= 0.12.0"

required_providers {
aws = "2.48.0"
ct = "0.5.0"
template = "~> 2.1"
aws = "3.3.0"
ct = "0.6.1"
template = "2.1.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ terraform {
required_version = ">= 0.12.0"

required_providers {
ct = "~> 0.4"
local = "~> 1.2"
null = "~> 2.1"
template = "~> 2.1"
tls = "~> 2.0"
matchbox = "~> 0.3"
ct = "0.6.1"
local = "1.4.0"
null = "2.1.2"
template = "2.1.2"
tls = "2.2.0"
matchbox = "0.4.1"
}
}
6 changes: 3 additions & 3 deletions assets/terraform-modules/bootkube/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
terraform {
required_version = ">= 0.12"
required_providers {
local = "~> 1.2"
template = "~> 2.1"
tls = "~> 2.0"
local = "1.4.0"
template = "2.1.2"
tls = "2.2.0"
}
}
2 changes: 1 addition & 1 deletion assets/terraform-modules/dns/cloudflare/require.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ terraform {
required_version = ">= 0.12.0"

required_providers {
cloudflare = "~> 2.0"
cloudflare = "2.9.0"
}
}
2 changes: 1 addition & 1 deletion assets/terraform-modules/dns/route53/require.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ terraform {
required_version = ">= 0.12.0"

required_providers {
aws = "2.48.0"
aws = "3.3.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ terraform {
required_version = ">= 0.12.0"

required_providers {
ct = "= 0.5.0"
local = "~> 1.2"
null = "~> 2.1"
template = "~> 2.1"
tls = "~> 2.0"
packet = "~> 2.7.3"
ct = "0.6.1"
local = "1.4.0"
null = "2.1.2"
template = "2.1.2"
tls = "2.2.0"
packet = "3.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_version = ">= 0.12.0"

required_providers {
ct = "= 0.5.0"
packet = "~> 2.7.3"
ct = "0.6.1"
packet = "3.0.0"
}
}
28 changes: 14 additions & 14 deletions pkg/assets/generated_assets.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/platform/aks/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ locals {
}
provider "azurerm" {
version = "2.2.0"
version = "2.24.0"
# https://github.com/terraform-providers/terraform-provider-azurerm/issues/5893
features {}
Expand All @@ -66,11 +66,11 @@ provider "local" {
{{- if .ApplicationName }}
provider "azuread" {
version = "0.8.0"
version = "0.11.0"
}
provider "random" {
version = "2.2.1"
version = "2.3.0"
}
resource "azuread_application" "aks" {
Expand Down
10 changes: 5 additions & 5 deletions pkg/platform/aws/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ module "worker-pool-{{ $index }}" {
{{- end }}
provider "aws" {
version = "2.48.0"
version = "3.3.0"
region = "{{.Config.Region}}"
{{- if .Config.CredsPath }}
Expand All @@ -187,23 +187,23 @@ provider "aws" {
}
provider "ct" {
version = "~> 0.3"
version = "0.6.1"
}
provider "local" {
version = "1.4.0"
}
provider "null" {
version = "~> 2.1"
version = "2.1.2"
}
provider "template" {
version = "~> 2.1"
version = "2.1.2"
}
provider "tls" {
version = "~> 2.0"
version = "2.2.0"
}
# Stub output, which indicates, that Terraform run at least once.
Expand Down
10 changes: 5 additions & 5 deletions pkg/platform/baremetal/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,31 +59,31 @@ module "bare-metal-{{.ClusterName}}" {
}
provider "matchbox" {
version = "~> 0.3"
version = "0.4.1"
endpoint = "{{.MatchboxEndpoint}}"
client_cert = file("{{.MatchboxClientCert}}")
client_key = file("{{.MatchboxClientKey}}")
ca = file("{{.MatchboxCA}}")
}
provider "ct" {
version = "~> 0.3"
version = "0.6.1"
}
provider "local" {
version = "1.4.0"
}
provider "null" {
version = "~> 2.1"
version = "2.1.2"
}
provider "template" {
version = "~> 2.1"
version = "2.1.2"
}
provider "tls" {
version = "~> 2.0"
version = "2.2.0"
}
# Stub output, which indicates, that Terraform run at least once.
Expand Down
12 changes: 6 additions & 6 deletions pkg/platform/packet/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ output "dns_entries" {
{{- if eq .Config.DNS.Provider "route53" }}
provider "aws" {
version = "2.48.0"
version = "3.3.0"
# The Route 53 service doesn't need a specific region to operate, however
# the AWS Terraform provider needs it and the documentation suggests to use
# "us-east-1": https://docs.aws.amazon.com/general/latest/gr/r53.html.
Expand All @@ -245,27 +245,27 @@ provider "aws" {
{{- end }}
provider "ct" {
version = "~> 0.3"
version = "0.6.1"
}
provider "local" {
version = "1.4.0"
}
provider "null" {
version = "~> 2.1"
version = "2.1.2"
}
provider "template" {
version = "~> 2.1"
version = "2.1.2"
}
provider "tls" {
version = "~> 2.0"
version = "2.2.0"
}
provider "packet" {
version = "~> 2.7.3"
version = "3.0.0"
{{- if .Config.AuthToken }}
auth_token = "{{.Config.AuthToken}}"
Expand Down

0 comments on commit 8a115b5

Please sign in to comment.