Skip to content

Commit ff61512

Browse files
JberlinskyJberlinsky
authored
Merge pull request #89 from terraform-google-modules/internal/remove-credentials-path
Remove credentials_path and credentials_path_relative
2 parents 5dc6786 + fc43491 commit ff61512

File tree

60 files changed

+28
-199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+28
-199
lines changed

‎examples/deploy_service/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ It will:
1616
|------|-------------|:----:|:-----:|:-----:|
1717
| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
1818
| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
19-
| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
2019
| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
2120
| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
2221
| network | The VPC network to host the cluster in | string | n/a | yes |
@@ -31,7 +30,6 @@ It will:
3130
| ca\_certificate | |
3231
| client\_token | |
3332
| cluster\_name | Cluster name |
34-
| credentials\_path | |
3533
| ip\_range\_pods | The secondary IP range used for pods |
3634
| ip\_range\_services | The secondary IP range used for services |
3735
| kubernetes\_endpoint | |

‎examples/deploy_service/main.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 2.2"
23-
credentials = "${file(var.credentials_path)}"
24-
region = "${var.region}"
22+
version = "~> 2.2"
23+
region = "${var.region}"
2524
}
2625

2726
provider "google-beta" {
28-
version = "~> 2.2"
29-
credentials = "${file(var.credentials_path)}"
30-
region = "${var.region}"
27+
version = "~> 2.2"
28+
region = "${var.region}"
3129
}
3230

3331
provider "kubernetes" {

‎examples/deploy_service/variables.tf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ variable "project_id" {
1818
description = "The project ID to host the cluster in"
1919
}
2020

21-
variable "credentials_path" {
22-
description = "The path to the GCP credentials JSON file"
23-
}
24-
2521
variable "cluster_name_suffix" {
2622
description = "A suffix to append to the default cluster name"
2723
default = ""

‎examples/node_pool/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ This example illustrates how to create a cluster with multiple custom node-pool
1010
|------|-------------|:----:|:-----:|:-----:|
1111
| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
1212
| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
13-
| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
1413
| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
1514
| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
1615
| network | The VPC network to host the cluster in | string | n/a | yes |
@@ -26,7 +25,6 @@ This example illustrates how to create a cluster with multiple custom node-pool
2625
| ca\_certificate | |
2726
| client\_token | |
2827
| cluster\_name | Cluster name |
29-
| credentials\_path | |
3028
| ip\_range\_pods | The secondary IP range used for pods |
3129
| ip\_range\_services | The secondary IP range used for services |
3230
| kubernetes\_endpoint | |

‎examples/node_pool/main.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 2.2"
23-
credentials = "${file(var.credentials_path)}"
24-
region = "${var.region}"
22+
version = "~> 2.2"
23+
region = "${var.region}"
2524
}
2625

2726
provider "google-beta" {
28-
version = "~> 2.2"
29-
credentials = "${file(var.credentials_path)}"
30-
region = "${var.region}"
27+
version = "~> 2.2"
28+
region = "${var.region}"
3129
}
3230

3331
module "gke" {

‎examples/node_pool/variables.tf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ variable "project_id" {
1818
description = "The project ID to host the cluster in"
1919
}
2020

21-
variable "credentials_path" {
22-
description = "The path to the GCP credentials JSON file"
23-
}
24-
2521
variable "cluster_name_suffix" {
2622
description = "A suffix to append to the default cluster name"
2723
default = ""

‎examples/shared_vpc/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ This example illustrates how to create a simple cluster where the host network i
1010
|------|-------------|:----:|:-----:|:-----:|
1111
| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
1212
| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
13-
| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
1413
| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
1514
| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
1615
| network | The VPC network to host the cluster in | string | n/a | yes |
@@ -26,7 +25,6 @@ This example illustrates how to create a simple cluster where the host network i
2625
| ca\_certificate | |
2726
| client\_token | |
2827
| cluster\_name | Cluster name |
29-
| credentials\_path | |
3028
| ip\_range\_pods | The secondary IP range used for pods |
3129
| ip\_range\_services | The secondary IP range used for services |
3230
| kubernetes\_endpoint | |

‎examples/shared_vpc/main.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 2.2"
23-
credentials = "${file(var.credentials_path)}"
24-
region = "${var.region}"
22+
version = "~> 2.2"
23+
region = "${var.region}"
2524
}
2625

2726
provider "google-beta" {
28-
version = "~> 2.2"
29-
credentials = "${file(var.credentials_path)}"
30-
region = "${var.region}"
27+
version = "~> 2.2"
28+
region = "${var.region}"
3129
}
3230

3331
module "gke" {

‎examples/shared_vpc/variables.tf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ variable "project_id" {
1818
description = "The project ID to host the cluster in"
1919
}
2020

21-
variable "credentials_path" {
22-
description = "The path to the GCP credentials JSON file"
23-
}
24-
2521
variable "cluster_name_suffix" {
2622
description = "A suffix to append to the default cluster name"
2723
default = ""

‎examples/simple_regional/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ This example illustrates how to create a simple cluster.
1010
|------|-------------|:----:|:-----:|:-----:|
1111
| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no |
1212
| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes |
13-
| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
1413
| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes |
1514
| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes |
1615
| network | The VPC network to host the cluster in | string | n/a | yes |
@@ -25,7 +24,6 @@ This example illustrates how to create a simple cluster.
2524
| ca\_certificate | |
2625
| client\_token | |
2726
| cluster\_name | Cluster name |
28-
| credentials\_path | |
2927
| ip\_range\_pods | The secondary IP range used for pods |
3028
| ip\_range\_services | The secondary IP range used for services |
3129
| kubernetes\_endpoint | |

0 commit comments

Comments
 (0)