Skip to content

Commit b27e426

Browse files
committed
Remove the ContainerCluster_sharedVpc test
1 parent 887c494 commit b27e426

File tree

1 file changed

+0
-129
lines changed

1 file changed

+0
-129
lines changed

google/resource_container_cluster_test.go

-129
Original file line numberDiff line numberDiff line change
@@ -1137,32 +1137,6 @@ func TestAccContainerCluster_withIPAllocationPolicy_createSubnetwork(t *testing.
11371137
})
11381138
}
11391139

1140-
func TestAccContainerCluster_sharedVpc(t *testing.T) {
1141-
t.Parallel()
1142-
1143-
clusterName := fmt.Sprintf("cluster-test-%s", acctest.RandString(10))
1144-
org := getTestOrgFromEnv(t)
1145-
billingId := getTestBillingAccountFromEnv(t)
1146-
projectName := fmt.Sprintf("tf-xpntest-%s", acctest.RandString(10))
1147-
1148-
resource.Test(t, resource.TestCase{
1149-
PreCheck: func() { testAccPreCheck(t) },
1150-
Providers: testAccProviders,
1151-
CheckDestroy: testAccCheckContainerClusterDestroy,
1152-
Steps: []resource.TestStep{
1153-
{
1154-
Config: testAccContainerCluster_sharedVpc(org, billingId, projectName, clusterName),
1155-
},
1156-
{
1157-
ResourceName: "google_container_cluster.shared_vpc_cluster",
1158-
ImportStateIdPrefix: fmt.Sprintf("%s-service/us-central1-a/", projectName),
1159-
ImportState: true,
1160-
ImportStateVerify: true,
1161-
},
1162-
},
1163-
})
1164-
}
1165-
11661140
func TestAccContainerCluster_withResourceLabels(t *testing.T) {
11671141
t.Parallel()
11681142

@@ -2254,109 +2228,6 @@ resource "google_container_cluster" "with_private_cluster" {
22542228
}
22552229
}`, clusterName, clusterName)
22562230
}
2257-
func testAccContainerCluster_sharedVpc(org, billingId, projectName, name string) string {
2258-
return fmt.Sprintf(`
2259-
resource "google_project" "host_project" {
2260-
name = "Test Project XPN Host"
2261-
project_id = "%s-host"
2262-
org_id = "%s"
2263-
billing_account = "%s"
2264-
}
2265-
2266-
resource "google_project_service" "host_project" {
2267-
project = "${google_project.host_project.project_id}"
2268-
service = "container.googleapis.com"
2269-
}
2270-
2271-
resource "google_compute_shared_vpc_host_project" "host_project" {
2272-
project = "${google_project_service.host_project.project}"
2273-
}
2274-
2275-
resource "google_project" "service_project" {
2276-
name = "Test Project XPN Service"
2277-
project_id = "%s-service"
2278-
org_id = "%s"
2279-
billing_account = "%s"
2280-
}
2281-
2282-
resource "google_project_service" "service_project" {
2283-
project = "${google_project.service_project.project_id}"
2284-
service = "container.googleapis.com"
2285-
}
2286-
2287-
resource "google_compute_shared_vpc_service_project" "service_project" {
2288-
host_project = "${google_compute_shared_vpc_host_project.host_project.project}"
2289-
service_project = "${google_project_service.service_project.project}"
2290-
}
2291-
2292-
resource "google_project_iam_member" "host_service_agent" {
2293-
project = "${google_project_service.host_project.project}"
2294-
role = "roles/container.hostServiceAgentUser"
2295-
member = "serviceAccount:service-${google_project.service_project.number}@container-engine-robot.iam.gserviceaccount.com"
2296-
2297-
depends_on = ["google_project_service.service_project"]
2298-
}
2299-
2300-
resource "google_compute_subnetwork_iam_member" "service_network_cloud_services" {
2301-
project = "${google_compute_shared_vpc_host_project.host_project.project}"
2302-
subnetwork = "${google_compute_subnetwork.shared_subnetwork.name}"
2303-
role = "roles/compute.networkUser"
2304-
member = "serviceAccount:${google_project.service_project.number}@cloudservices.gserviceaccount.com"
2305-
}
2306-
2307-
resource "google_compute_subnetwork_iam_member" "service_network_gke_user" {
2308-
project = "${google_compute_shared_vpc_host_project.host_project.project}"
2309-
subnetwork = "${google_compute_subnetwork.shared_subnetwork.name}"
2310-
role = "roles/compute.networkUser"
2311-
member = "serviceAccount:service-${google_project.service_project.number}@container-engine-robot.iam.gserviceaccount.com"
2312-
}
2313-
2314-
resource "google_compute_network" "shared_network" {
2315-
name = "test-%s"
2316-
project = "${google_compute_shared_vpc_host_project.host_project.project}"
2317-
2318-
auto_create_subnetworks = false
2319-
}
2320-
2321-
resource "google_compute_subnetwork" "shared_subnetwork" {
2322-
name = "test-%s"
2323-
ip_cidr_range = "10.0.0.0/16"
2324-
region = "us-central1"
2325-
network = "${google_compute_network.shared_network.self_link}"
2326-
project = "${google_compute_shared_vpc_host_project.host_project.project}"
2327-
2328-
secondary_ip_range {
2329-
range_name = "pods"
2330-
ip_cidr_range = "10.1.0.0/16"
2331-
}
2332-
2333-
secondary_ip_range {
2334-
range_name = "services"
2335-
ip_cidr_range = "10.2.0.0/20"
2336-
}
2337-
}
2338-
2339-
resource "google_container_cluster" "shared_vpc_cluster" {
2340-
name = "%s"
2341-
zone = "us-central1-a"
2342-
initial_node_count = 1
2343-
project = "${google_compute_shared_vpc_service_project.service_project.service_project}"
2344-
2345-
network = "${google_compute_network.shared_network.self_link}"
2346-
subnetwork = "${google_compute_subnetwork.shared_subnetwork.self_link}"
2347-
2348-
ip_allocation_policy {
2349-
cluster_secondary_range_name = "${google_compute_subnetwork.shared_subnetwork.secondary_ip_range.0.range_name}"
2350-
services_secondary_range_name = "${google_compute_subnetwork.shared_subnetwork.secondary_ip_range.1.range_name}"
2351-
}
2352-
2353-
depends_on = [
2354-
"google_project_iam_member.host_service_agent",
2355-
"google_compute_subnetwork_iam_member.service_network_cloud_services",
2356-
"google_compute_subnetwork_iam_member.service_network_gke_user"
2357-
]
2358-
}`, projectName, org, billingId, projectName, org, billingId, acctest.RandString(10), acctest.RandString(10), name)
2359-
}
23602231

23612232
func testAccContainerCluster_withoutResourceLabels(clusterName string) string {
23622233
return fmt.Sprintf(`

0 commit comments

Comments
 (0)