Skip to content

Commit

Permalink
Remove credentials_path and credentials_path_relative
Browse files Browse the repository at this point in the history
  • Loading branch information
Jberlinsky committed Mar 5, 2019
1 parent 8205618 commit 1c64973
Show file tree
Hide file tree
Showing 60 changed files with 0 additions and 165 deletions.
2 changes: 0 additions & 2 deletions examples/deploy_service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ It will:
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| compute_engine_service_account | Service account to associate to the nodes in the cluster | string | - | yes |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -32,7 +31,6 @@ It will:
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/deploy_service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/deploy_service/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/node_pool/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ This example illustrates how to create a cluster with multiple custom node-pool
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| compute_engine_service_account | Service account to associate to the nodes in the cluster | string | - | yes |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -26,7 +25,6 @@ This example illustrates how to create a cluster with multiple custom node-pool
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/node_pool/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/shared_vpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ This example illustrates how to create a simple cluster where the host network i
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| compute_engine_service_account | Service account to associate to the nodes in the cluster | string | - | yes |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -27,7 +26,6 @@ This example illustrates how to create a simple cluster where the host network i
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/shared_vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/shared_vpc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_regional/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ This example illustrates how to create a simple cluster.
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| compute_engine_service_account | Service account to associate to the nodes in the cluster | string | - | yes |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -26,7 +25,6 @@ This example illustrates how to create a simple cluster.
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/simple_regional/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_regional_private/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ This example illustrates how to create a simple private cluster.
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| compute_engine_service_account | Service account to associate to the nodes in the cluster | string | - | yes |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -26,7 +25,6 @@ This example illustrates how to create a simple private cluster.
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google-beta" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/simple_regional_private/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_zonal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ This example illustrates how to create a simple cluster.
| Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -26,7 +25,6 @@ This example illustrates how to create a simple cluster.
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/simple_zonal/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/simple_zonal/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/simple_zonal_private/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ This example illustrates how to create a simple private cluster.
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| compute_engine_service_account | Service account to associate to the nodes in the cluster | string | - | yes |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -27,7 +26,6 @@ This example illustrates how to create a simple private cluster.
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/simple_zonal_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google-beta" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/simple_zonal_private/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
2 changes: 0 additions & 2 deletions examples/stub_domains/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ It will:
|------|-------------|:----:|:-----:|:-----:|
| cluster_name_suffix | A suffix to append to the default cluster name | string | `` | no |
| compute_engine_service_account | Service account to associate to the nodes in the cluster | string | - | yes |
| credentials_path | The path to the GCP credentials JSON file | string | - | yes |
| ip_range_pods | The secondary ip range to use for pods | string | - | yes |
| ip_range_services | The secondary ip range to use for pods | string | - | yes |
| network | The VPC network to host the cluster in | string | - | yes |
Expand All @@ -31,7 +30,6 @@ It will:
| ca_certificate | |
| client_token | |
| cluster_name | Cluster name |
| credentials_path | |
| ip_range_pods | The secondary IP range used for pods |
| ip_range_services | The secondary IP range used for services |
| kubernetes_endpoint | |
Expand Down
1 change: 0 additions & 1 deletion examples/stub_domains/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ locals {
}

provider "google" {
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}

Expand Down
4 changes: 0 additions & 4 deletions examples/stub_domains/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The project ID to host the cluster in"
}

variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
Expand Down
4 changes: 0 additions & 4 deletions test/fixtures/all_examples/test_outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ output "project_id" {
value = "${var.project_id}"
}

output "credentials_path" {
value = "${var.credentials_path}"
}

output "region" {
value = "${module.gke.region}"
}
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/deploy_service/example.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module "example" {
source = "../../../examples/deploy_service"

project_id = "${var.project_id}"
credentials_path = "${local.credentials_path}"
cluster_name_suffix = "-${random_string.suffix.result}"
region = "${var.region}"
network = "${google_compute_network.main.name}"
Expand Down
5 changes: 0 additions & 5 deletions test/fixtures/deploy_service/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,13 @@
* limitations under the License.
*/

locals {
credentials_path = "${path.module}/${var.credentials_path_relative}"
}

resource "random_string" "suffix" {
length = 4
special = false
upper = false
}

provider "google" {
credentials = "${file(local.credentials_path)}"
project = "${var.project_id}"
}

Expand Down
1 change: 0 additions & 1 deletion test/fixtures/node_pool/example.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module "example" {
source = "../../../examples/node_pool"

project_id = "${var.project_id}"
credentials_path = "${local.credentials_path}"
cluster_name_suffix = "-${random_string.suffix.result}"
region = "${var.region}"
network = "${google_compute_network.main.name}"
Expand Down
5 changes: 0 additions & 5 deletions test/fixtures/node_pool/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,13 @@
* limitations under the License.
*/

locals {
credentials_path = "${path.module}/${var.credentials_path_relative}"
}

resource "random_string" "suffix" {
length = 4
special = false
upper = false
}

provider "google" {
credentials = "${file(local.credentials_path)}"
project = "${var.project_id}"
}

Expand Down
4 changes: 0 additions & 4 deletions test/fixtures/shared/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ output "project_id" {
value = "${var.project_id}"
}

output "credentials_path" {
value = "${local.credentials_path}"
}

output "region" {
value = "${module.example.region}"
}
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/shared/terraform.tfvars.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
project_id=""
credentials_path_relative="../../../credentials.json"
region="us-east4"
zones=["us-east4-a","us-east4-b","us-east4-c"]
compute_engine_service_account=""
4 changes: 0 additions & 4 deletions test/fixtures/shared/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ variable "project_id" {
description = "The GCP project to use for integration tests"
}

variable "credentials_path_relative" {
description = "The relative path from the fixture directory to the GCP credentials file that will run Terraform tests"
}

variable "region" {
description = "The GCP region to create and test resources in"
}
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/shared_vpc/example.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module "example" {
source = "../../../examples/shared_vpc"

project_id = "${var.project_id}"
credentials_path = "${local.credentials_path}"
cluster_name_suffix = "-${random_string.suffix.result}"
region = "${var.region}"
network = "${google_compute_network.main.name}"
Expand Down
5 changes: 0 additions & 5 deletions test/fixtures/shared_vpc/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,13 @@
* limitations under the License.
*/

locals {
credentials_path = "${path.module}/${var.credentials_path_relative}"
}

resource "random_string" "suffix" {
length = 4
special = false
upper = false
}

provider "google" {
credentials = "${file(local.credentials_path)}"
project = "${var.project_id}"
}

Expand Down
Loading

0 comments on commit 1c64973

Please sign in to comment.