Skip to content

Commit d791335

Browse files
committed
Removed the custom test for create_service_account
I will integrate the test with the workload identity test.
1 parent 3c4e8a1 commit d791335

File tree

19 files changed

+30
-448
lines changed

19 files changed

+30
-448
lines changed

.kitchen.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ platforms:
2929
- name: local
3030

3131
suites:
32-
- name: "create_service_account"
33-
driver:
34-
root_module_directory: test/fixtures/create_service_account
35-
verifier:
36-
systems:
37-
- name: create_service_account
38-
backend: local
3932
- name: "deploy_service"
4033
driver:
4134
root_module_directory: test/fixtures/deploy_service

examples/create_service_account/README.md

Lines changed: 0 additions & 45 deletions
This file was deleted.

examples/create_service_account/main.tf

Lines changed: 0 additions & 63 deletions
This file was deleted.

examples/create_service_account/outputs.tf

Lines changed: 0 additions & 35 deletions
This file was deleted.

examples/create_service_account/test_outputs.tf

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/create_service_account/variables.tf

Lines changed: 0 additions & 54 deletions
This file was deleted.

examples/workload_metadata_config/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ module "gke" {
4040
subnetwork = var.subnetwork
4141
ip_range_pods = var.ip_range_pods
4242
ip_range_services = var.ip_range_services
43-
create_service_account = false
44-
service_account = var.compute_engine_service_account
43+
create_service_account = true
44+
grant_registry_access = true
45+
registry_project_id = var.registry_project_id
4546
enable_private_endpoint = true
4647
enable_private_nodes = true
4748
master_ipv4_cidr_block = "172.16.0.0/28"

examples/workload_metadata_config/variables.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ variable "ip_range_services" {
4848
description = "The secondary ip range to use for pods"
4949
}
5050

51-
variable "compute_engine_service_account" {
52-
description = "Service account to associate to the nodes in the cluster"
51+
variable "registry_project_id" {
52+
description = "Project name for the GCR registry"
5353
}
54-

test/ci/create-service-account.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/fixtures/create_service_account/example.tf

Lines changed: 0 additions & 30 deletions
This file was deleted.

test/fixtures/create_service_account/network.tf

Lines changed: 0 additions & 47 deletions
This file was deleted.

test/fixtures/create_service_account/outputs.tf

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixtures/create_service_account/terraform.tfvars

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixtures/create_service_account/variables.tf

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixtures/workload_metadata_config/example.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ module "example" {
2525
subnetwork = google_compute_subnetwork.main.name
2626
ip_range_pods = google_compute_subnetwork.main.secondary_ip_range[0].range_name
2727
ip_range_services = google_compute_subnetwork.main.secondary_ip_range[1].range_name
28-
compute_engine_service_account = var.compute_engine_service_account
28+
registry_project_id = var.registry_project_id
2929
}

0 commit comments

Comments
 (0)