mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-01 16:21:06 +00:00
Remove the ContainerCluster_sharedVpc test
This commit is contained in:
parent
fb1fd69cc6
commit
7a182b070d
@ -1137,32 +1137,6 @@ func TestAccContainerCluster_withIPAllocationPolicy_createSubnetwork(t *testing.
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAccContainerCluster_sharedVpc(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
clusterName := fmt.Sprintf("cluster-test-%s", acctest.RandString(10))
|
|
||||||
org := getTestOrgFromEnv(t)
|
|
||||||
billingId := getTestBillingAccountFromEnv(t)
|
|
||||||
projectName := fmt.Sprintf("tf-xpntest-%s", acctest.RandString(10))
|
|
||||||
|
|
||||||
resource.Test(t, resource.TestCase{
|
|
||||||
PreCheck: func() { testAccPreCheck(t) },
|
|
||||||
Providers: testAccProviders,
|
|
||||||
CheckDestroy: testAccCheckContainerClusterDestroy,
|
|
||||||
Steps: []resource.TestStep{
|
|
||||||
{
|
|
||||||
Config: testAccContainerCluster_sharedVpc(org, billingId, projectName, clusterName),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ResourceName: "google_container_cluster.shared_vpc_cluster",
|
|
||||||
ImportStateIdPrefix: fmt.Sprintf("%s-service/us-central1-a/", projectName),
|
|
||||||
ImportState: true,
|
|
||||||
ImportStateVerify: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAccContainerCluster_withResourceLabels(t *testing.T) {
|
func TestAccContainerCluster_withResourceLabels(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
@ -2254,109 +2228,6 @@ resource "google_container_cluster" "with_private_cluster" {
|
|||||||
}
|
}
|
||||||
}`, clusterName, clusterName)
|
}`, clusterName, clusterName)
|
||||||
}
|
}
|
||||||
func testAccContainerCluster_sharedVpc(org, billingId, projectName, name string) string {
|
|
||||||
return fmt.Sprintf(`
|
|
||||||
resource "google_project" "host_project" {
|
|
||||||
name = "Test Project XPN Host"
|
|
||||||
project_id = "%s-host"
|
|
||||||
org_id = "%s"
|
|
||||||
billing_account = "%s"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_project_service" "host_project" {
|
|
||||||
project = "${google_project.host_project.project_id}"
|
|
||||||
service = "container.googleapis.com"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_compute_shared_vpc_host_project" "host_project" {
|
|
||||||
project = "${google_project_service.host_project.project}"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_project" "service_project" {
|
|
||||||
name = "Test Project XPN Service"
|
|
||||||
project_id = "%s-service"
|
|
||||||
org_id = "%s"
|
|
||||||
billing_account = "%s"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_project_service" "service_project" {
|
|
||||||
project = "${google_project.service_project.project_id}"
|
|
||||||
service = "container.googleapis.com"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_compute_shared_vpc_service_project" "service_project" {
|
|
||||||
host_project = "${google_compute_shared_vpc_host_project.host_project.project}"
|
|
||||||
service_project = "${google_project_service.service_project.project}"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_project_iam_member" "host_service_agent" {
|
|
||||||
project = "${google_project_service.host_project.project}"
|
|
||||||
role = "roles/container.hostServiceAgentUser"
|
|
||||||
member = "serviceAccount:service-${google_project.service_project.number}@container-engine-robot.iam.gserviceaccount.com"
|
|
||||||
|
|
||||||
depends_on = ["google_project_service.service_project"]
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_compute_subnetwork_iam_member" "service_network_cloud_services" {
|
|
||||||
project = "${google_compute_shared_vpc_host_project.host_project.project}"
|
|
||||||
subnetwork = "${google_compute_subnetwork.shared_subnetwork.name}"
|
|
||||||
role = "roles/compute.networkUser"
|
|
||||||
member = "serviceAccount:${google_project.service_project.number}@cloudservices.gserviceaccount.com"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_compute_subnetwork_iam_member" "service_network_gke_user" {
|
|
||||||
project = "${google_compute_shared_vpc_host_project.host_project.project}"
|
|
||||||
subnetwork = "${google_compute_subnetwork.shared_subnetwork.name}"
|
|
||||||
role = "roles/compute.networkUser"
|
|
||||||
member = "serviceAccount:service-${google_project.service_project.number}@container-engine-robot.iam.gserviceaccount.com"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_compute_network" "shared_network" {
|
|
||||||
name = "test-%s"
|
|
||||||
project = "${google_compute_shared_vpc_host_project.host_project.project}"
|
|
||||||
|
|
||||||
auto_create_subnetworks = false
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_compute_subnetwork" "shared_subnetwork" {
|
|
||||||
name = "test-%s"
|
|
||||||
ip_cidr_range = "10.0.0.0/16"
|
|
||||||
region = "us-central1"
|
|
||||||
network = "${google_compute_network.shared_network.self_link}"
|
|
||||||
project = "${google_compute_shared_vpc_host_project.host_project.project}"
|
|
||||||
|
|
||||||
secondary_ip_range {
|
|
||||||
range_name = "pods"
|
|
||||||
ip_cidr_range = "10.1.0.0/16"
|
|
||||||
}
|
|
||||||
|
|
||||||
secondary_ip_range {
|
|
||||||
range_name = "services"
|
|
||||||
ip_cidr_range = "10.2.0.0/20"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "google_container_cluster" "shared_vpc_cluster" {
|
|
||||||
name = "%s"
|
|
||||||
zone = "us-central1-a"
|
|
||||||
initial_node_count = 1
|
|
||||||
project = "${google_compute_shared_vpc_service_project.service_project.service_project}"
|
|
||||||
|
|
||||||
network = "${google_compute_network.shared_network.self_link}"
|
|
||||||
subnetwork = "${google_compute_subnetwork.shared_subnetwork.self_link}"
|
|
||||||
|
|
||||||
ip_allocation_policy {
|
|
||||||
cluster_secondary_range_name = "${google_compute_subnetwork.shared_subnetwork.secondary_ip_range.0.range_name}"
|
|
||||||
services_secondary_range_name = "${google_compute_subnetwork.shared_subnetwork.secondary_ip_range.1.range_name}"
|
|
||||||
}
|
|
||||||
|
|
||||||
depends_on = [
|
|
||||||
"google_project_iam_member.host_service_agent",
|
|
||||||
"google_compute_subnetwork_iam_member.service_network_cloud_services",
|
|
||||||
"google_compute_subnetwork_iam_member.service_network_gke_user"
|
|
||||||
]
|
|
||||||
}`, projectName, org, billingId, projectName, org, billingId, acctest.RandString(10), acctest.RandString(10), name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func testAccContainerCluster_withoutResourceLabels(clusterName string) string {
|
func testAccContainerCluster_withoutResourceLabels(clusterName string) string {
|
||||||
return fmt.Sprintf(`
|
return fmt.Sprintf(`
|
||||||
|
Loading…
Reference in New Issue
Block a user