Skip to content

Commit 05a54e5

Browse files
committed
gcve: terraform comment cleanups
1 parent 2ebdf59 commit 05a54e5

File tree

3 files changed

+2
-49
lines changed

3 files changed

+2
-49
lines changed

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/modules/gcp-gcve-project/main.tf

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,3 @@ resource "vsphere_folder" "project_folder" {
3232
type = "vm"
3333
datacenter_id = var.vsphere_datacenter_id
3434
}
35-
36-
# Permissions
37-
38-
# resource "vsphere_entity_permissions" "permission_resource_pool_project" {
39-
# count = var.nr_projects
40-
41-
# entity_id = vsphere_resource_pool.project_resource_pool[count.index].id
42-
# entity_type = "ResourcePool"
43-
# permissions {
44-
# user_or_group = var.group
45-
# propagate = true
46-
# is_group = true
47-
# role_id = var.role_id
48-
# }
49-
50-
# depends_on = [vsphere_resource_pool.project_resource_pool]
51-
# }
52-
53-
# resource "vsphere_entity_permissions" "permission_folder_project" {
54-
# count = var.nr_projects
55-
56-
# entity_id = vsphere_folder.project_folder[count.index].id
57-
# entity_type = "Folder"
58-
# permissions {
59-
# user_or_group = var.group
60-
# propagate = true
61-
# is_group = true
62-
# role_id = var.role_id
63-
# }
64-
65-
# depends_on = [vsphere_folder.project_folder]
66-
# }

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/modules/gcp-gcve-project/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ limitations under the License.
1515
*/
1616

1717
variable "project_name" {
18-
description = "The name of the project which normally matches the repository name, e.g. cluster-api-provider-vsphere"
18+
description = "The name of the project which matches the boskos resource name"
1919
type = string
2020
}
2121

2222
variable "nr_projects" {
23-
description = "The name of the project which normally matches the repository name, e.g. cluster-api-provider-vsphere"
23+
description = "The number of projects to create"
2424
type = number
2525
}
2626

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/projects.tf

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@ locals {
1818
gcp_gcve_project_name = "k8s-infra-e2e-gcp-gcve-project"
1919
}
2020

21-
# ## create global permissions to read cluster, datastore, host information etc.
22-
# module "cluster-api-provider-vsphere-iam" {
23-
# source = "./modules/vsphere-project-iam"
24-
25-
# group = var.cluster_api_provider_vsphere_iam_group
26-
# vsphere_role_id = vsphere_role.vsphere-ci.id
27-
# vsphere_datacenter_id = data.vsphere_datacenter.datacenter.id
28-
# vsphere_datastore_id = data.vsphere_datastore.datastore.id
29-
# vsphere_compute_cluster_id = data.vsphere_compute_cluster.compute_cluster.id
30-
# vsphere_resource_pool_id = vsphere_resource_pool.prow.id
31-
# vsphere_network_name = var.vsphere_network_name
32-
33-
# depends_on = [ vsphere_role.vsphere-ci, vsphere_resource_pool.prow ]
34-
# }
35-
3621
## create the projects (resource pool, folder, assign permissions per resource pool and folder)
3722
module "gcp-gcve-projects" {
3823
source = "./modules/gcp-gcve-project"

0 commit comments

Comments
 (0)