Skip to content

Commit e2ef106

Browse files
michaeljguarinomichaeljguarino
authored
Merge pull request #146 from pluralsh/fix-tf-helm-resolution
Fix resolution of helm terraform provider where used
2 parents 1c0097b + 394951b commit e2ef106

13 files changed

Lines changed: 111 additions & 113 deletions

File tree

‎existing/test/azure/.terraform.lock.hcl‎

Lines changed: 15 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎existing/test/azure/versions.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
version = "3.6.0"
2020
}
2121
helm = {
22-
source = "hashicorp/helm"
23-
version = "2.12.1"
22+
source = "hashicorp/helm"
23+
version = ">= 3.0.0, < 4.0.0"
2424
}
2525
local = {
26-
source = "hashicorp/local"
26+
source = "hashicorp/local"
2727
version = "2.5.1"
2828
}
2929
}
@@ -49,14 +49,14 @@ provider "kubernetes" {
4949
}
5050

5151
provider "helm" {
52-
kubernetes {
52+
kubernetes = {
5353
host = module.mgmt.cluster.cluster_fqdn
5454
cluster_ca_certificate = base64decode(module.mgmt.cluster.cluster_ca_certificate)
5555
client_certificate = base64decode(module.mgmt.cluster.client_certificate)
5656
client_key = base64decode(module.mgmt.cluster.client_key)
5757
}
5858

59-
experiments {
59+
experiments = {
6060
manifest = false
6161
}
6262
}

‎templates/providers/bootstrap/aws.tf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33

44
backend "s3" {
55
bucket = "{{ .Bucket }}"
6-
key = "{{ .Cluster }}/bootstrap/terraform.tfstate"
6+
key = "{{ .Cluster }}/bootstrap/terraform.tfstate"
77
region = "{{ .Region }}"
88
}
99

@@ -21,15 +21,15 @@ terraform {
2121
version = "3.6.0"
2222
}
2323
helm = {
24-
source = "hashicorp/helm"
25-
version = "2.14.0"
24+
source = "hashicorp/helm"
25+
version = ">= 3.0.0, < 4.0.0"
2626
}
2727
local = {
28-
source = "hashicorp/local"
28+
source = "hashicorp/local"
2929
version = "2.5.2"
3030
}
3131
plural = {
32-
source = "pluralsh/plural"
32+
source = "pluralsh/plural"
3333
version = ">= 0.2.16"
3434
}
3535
}
@@ -43,15 +43,15 @@ data "aws_eks_cluster" "cluster" {
4343
name = module.mgmt.cluster.cluster_name
4444

4545
# BEGIN REMOVE
46-
depends_on = [ module.mgmt.cluster ]
46+
depends_on = [module.mgmt.cluster]
4747
# END REMOVE
4848
}
4949

5050
data "aws_eks_cluster_auth" "cluster" {
5151
name = module.mgmt.cluster.cluster_name
5252

5353
# BEGIN REMOVE
54-
depends_on = [ module.mgmt.cluster ]
54+
depends_on = [module.mgmt.cluster]
5555
# END REMOVE
5656
}
5757

@@ -62,7 +62,7 @@ provider "kubernetes" {
6262
}
6363

6464
provider "helm" {
65-
kubernetes {
65+
kubernetes = {
6666
host = module.mgmt.cluster.cluster_endpoint
6767
cluster_ca_certificate = base64decode(module.mgmt.cluster.cluster_certificate_authority_data)
6868
token = data.aws_eks_cluster_auth.cluster.token
@@ -83,6 +83,6 @@ output "vpc_id" {
8383
}
8484

8585
variable "use_cli" {
86-
type = bool
86+
type = bool
8787
default = true
8888
}

‎templates/providers/bootstrap/azure.tf‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ terraform {
33

44
backend "azurerm" {
55
storage_account_name = "{{ .Context.StorageAccount }}"
6-
subscription_id = "{{ .Context.SubscriptionId }}"
7-
resource_group_name = "{{ .Project }}"
8-
container_name = "{{ .Bucket }}"
9-
key = "{{ .Cluster }}/bootstrap/terraform.tfstate"
6+
subscription_id = "{{ .Context.SubscriptionId }}"
7+
resource_group_name = "{{ .Project }}"
8+
container_name = "{{ .Bucket }}"
9+
key = "{{ .Cluster }}/bootstrap/terraform.tfstate"
1010
}
1111

1212
required_providers {
@@ -27,15 +27,15 @@ terraform {
2727
version = "3.6.0"
2828
}
2929
helm = {
30-
source = "hashicorp/helm"
31-
version = "2.14.0"
30+
source = "hashicorp/helm"
31+
version = ">= 3.0.0, < 4.0.0"
3232
}
3333
local = {
34-
source = "hashicorp/local"
34+
source = "hashicorp/local"
3535
version = "2.5.2"
3636
}
3737
plural = {
38-
source = "pluralsh/plural"
38+
source = "pluralsh/plural"
3939
version = ">= 0.2.16"
4040
}
4141
}
@@ -53,7 +53,7 @@ provider "azurerm" {
5353
}
5454

5555
subscription_id = "{{ .Context.SubscriptionId }}"
56-
tenant_id = "{{ .Context.TenantId }}"
56+
tenant_id = "{{ .Context.TenantId }}"
5757
}
5858

5959
provider "kubernetes" {
@@ -64,7 +64,7 @@ provider "kubernetes" {
6464
}
6565

6666
provider "helm" {
67-
kubernetes {
67+
kubernetes = {
6868
host = module.mgmt.cluster.cluster_fqdn
6969
cluster_ca_certificate = base64decode(module.mgmt.cluster.cluster_ca_certificate)
7070
client_certificate = base64decode(module.mgmt.cluster.client_certificate)
@@ -77,6 +77,6 @@ provider "plural" {
7777
}
7878

7979
variable "use_cli" {
80-
type = bool
80+
type = bool
8181
default = true
8282
}

‎templates/providers/bootstrap/byok.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ terraform {
1010
}
1111
helm = {
1212
source = "hashicorp/helm"
13-
version = "2.14.0"
13+
version = ">= 3.0.0, < 4.0.0"
1414
}
1515
local = {
1616
source = "hashicorp/local"
@@ -28,7 +28,7 @@ provider "kubernetes" {
2828
}
2929

3030
provider "helm" {
31-
kubernetes {
31+
kubernetes = {
3232
config_path = "~/.kube/config"
3333
}
3434
}

‎templates/providers/bootstrap/gcp.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ terraform {
66

77
required_providers {
88
google = {
9-
source = "hashicorp/google"
9+
source = "hashicorp/google"
1010
version = ">= 6.10.0"
1111
}
1212
kubernetes = {
13-
source = "hashicorp/kubernetes"
13+
source = "hashicorp/kubernetes"
1414
version = ">= 2.10"
1515
}
1616
random = {
1717
source = "hashicorp/random"
1818
version = "3.6.0"
1919
}
2020
helm = {
21-
source = "hashicorp/helm"
22-
version = "2.14.0"
21+
source = "hashicorp/helm"
22+
version = ">= 3.0.0, < 4.0.0"
2323
}
2424
local = {
25-
source = "hashicorp/local"
25+
source = "hashicorp/local"
2626
version = "2.5.2"
2727
}
2828
plural = {
29-
source = "pluralsh/plural"
29+
source = "pluralsh/plural"
3030
version = ">= 0.2.16"
3131
}
3232
}
@@ -43,7 +43,7 @@ provider "kubernetes" {
4343
}
4444

4545
provider "helm" {
46-
kubernetes {
46+
kubernetes = {
4747
host = module.mgmt.cluster.endpoint
4848
cluster_ca_certificate = base64decode(module.mgmt.cluster.ca_certificate)
4949
token = data.google_client_config.default.access_token
@@ -55,6 +55,6 @@ provider "plural" {
5555
}
5656

5757
variable "use_cli" {
58-
type = bool
58+
type = bool
5959
default = true
6060
}

‎templates/providers/bootstrap/linode.tf‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ terraform {
33

44
backend "s3" {
55
endpoint = "us-east-1.linodeobjects.com"
6-
bucket = "{{ .Bucket }}"
7-
key = "{{ .Cluster }}/bootstrap/terraform.tfstate"
8-
region = "us-east-1"
6+
bucket = "{{ .Bucket }}"
7+
key = "{{ .Cluster }}/bootstrap/terraform.tfstate"
8+
region = "us-east-1"
99
}
1010

1111
required_providers {
1212
linode = {
1313
source = "linode/linode"
14-
version = "~> 2.13.0"
14+
version = "~> 2.13.0"
1515
}
1616
kubernetes = {
1717
source = "hashicorp/kubernetes"
@@ -22,15 +22,15 @@ terraform {
2222
version = "3.6.0"
2323
}
2424
helm = {
25-
source = "hashicorp/helm"
26-
version = "2.14.0"
25+
source = "hashicorp/helm"
26+
version = ">= 3.0.0, < 4.0.0"
2727
}
2828
local = {
29-
source = "hashicorp/local"
29+
source = "hashicorp/local"
3030
version = "2.5.2"
3131
}
3232
plural = {
33-
source = "pluralsh/plural"
33+
source = "pluralsh/plural"
3434
version = ">= 0.2.0"
3535
}
3636
}
@@ -39,12 +39,12 @@ terraform {
3939
provider "linode" {}
4040

4141
module "parsed" {
42-
source = "../bootstrap/terraform/modules/raw-kubeconfig"
43-
kubeconfig = module.mgmt.cluster.kubeconfig
42+
source = "../bootstrap/terraform/modules/raw-kubeconfig"
43+
kubeconfig = module.mgmt.cluster.kubeconfig
4444
}
4545

4646
provider "helm" {
47-
kubernetes {
47+
kubernetes = {
4848
host = module.parsed.cluster.server
4949
cluster_ca_certificate = base64decode(module.parsed.cluster.certificate-authority-data)
5050
token = module.parsed.user.token
@@ -56,6 +56,6 @@ provider "plural" {
5656
}
5757

5858
variable "use_cli" {
59-
type = bool
59+
type = bool
6060
default = true
6161
}

‎terraform/modules/clusters/aws/versions.tf‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ terraform {
88
}
99

1010
plural = {
11-
source = "pluralsh/plural"
11+
source = "pluralsh/plural"
1212
version = ">= 0.2.9"
1313
}
14-
15-
helm = {
16-
source = "hashicorp/helm"
17-
version = "< 3.0.0"
18-
}
1914
}
2015
}
2116

@@ -24,4 +19,4 @@ provider "aws" {
2419
}
2520

2621

27-
provider "plural" { }
22+
provider "plural" {}

‎test/aws/.terraform.lock.hcl‎

Lines changed: 15 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)