Skip to content
This repository has been archived by the owner on Nov 27, 2024. It is now read-only.

Commit

Permalink
Fixed full_container_cluster test
Browse files Browse the repository at this point in the history
Had to update the terraform file for compatibility with GoogleCloudPlatform/magic-modules#4762
  • Loading branch information
melinath committed Jul 20, 2021
1 parent 9427b36 commit c73e3fc
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 39 deletions.
1 change: 0 additions & 1 deletion testdata/templates/full_container_cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ resource "google_container_cluster" "full_list_default_1" {
enable_private_nodes = true
master_ipv4_cidr_block = "127.0.0.0/28"
}
remove_default_node_pool = true
resource_labels = {
test-resource_labels-key = "test-resource_labels-value"
}
Expand Down
75 changes: 37 additions & 38 deletions testdata/templates/full_container_cluster.tfplan.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"format_version": "0.1",
"terraform_version": "0.12.20",
"terraform_version": "0.13.6",
"planned_values": {
"root_module": {
"resources": [
Expand All @@ -9,7 +9,7 @@
"mode": "managed",
"type": "google_container_cluster",
"name": "full_list_default_1",
"provider_name": "google",
"provider_name": "registry.terraform.io/hashicorp/google",
"schema_version": 1,
"values": {
"addons_config": [
Expand All @@ -33,9 +33,11 @@
],
"default_max_pods_per_node": 42,
"description": "test-description",
"enable_autopilot": null,
"enable_binary_authorization": false,
"enable_kubernetes_alpha": true,
"enable_legacy_abac": true,
"enable_tpu": null,
"initial_node_count": 42,
"ip_allocation_policy": [
{
Expand All @@ -51,7 +53,9 @@
{
"start_time": "03:00"
}
]
],
"maintenance_exclusion": [],
"recurring_window": []
}
],
"master_auth": [
Expand Down Expand Up @@ -128,22 +132,19 @@
"test-node_locations"
],
"node_version": "test-node_version",
"pod_security_policy_config": [],
"private_cluster_config": [
{
"enable_private_endpoint": true,
"enable_private_nodes": true,
"master_ipv4_cidr_block": "127.0.0.0/28"
}
],
"workload_identity_config": [
{
"identity_namespace": "testproject.svc.id.goog"
}
],
"remove_default_node_pool": true,
"remove_default_node_pool": null,
"resource_labels": {
"test-resource_labels-key": "test-resource_labels-value"
},
"resource_usage_export_config": [],
"subnetwork": "test-subnetwork",
"timeouts": null,
"vertical_pod_autoscaling": []
Expand All @@ -158,7 +159,7 @@
"mode": "managed",
"type": "google_container_cluster",
"name": "full_list_default_1",
"provider_name": "google",
"provider_name": "registry.terraform.io/hashicorp/google",
"change": {
"actions": [
"create"
Expand Down Expand Up @@ -186,9 +187,11 @@
],
"default_max_pods_per_node": 42,
"description": "test-description",
"enable_autopilot": null,
"enable_binary_authorization": false,
"enable_kubernetes_alpha": true,
"enable_legacy_abac": true,
"enable_tpu": null,
"initial_node_count": 42,
"ip_allocation_policy": [
{
Expand All @@ -204,7 +207,9 @@
{
"start_time": "03:00"
}
]
],
"maintenance_exclusion": [],
"recurring_window": []
}
],
"master_auth": [
Expand Down Expand Up @@ -281,37 +286,33 @@
"test-node_locations"
],
"node_version": "test-node_version",
"pod_security_policy_config": [],
"private_cluster_config": [
{
"enable_private_endpoint": true,
"enable_private_nodes": true,
"master_ipv4_cidr_block": "127.0.0.0/28"
}
],
"workload_identity_config": [
{
"identity_namespace": "testproject.svc.id.goog"
}
],
"remove_default_node_pool": true,
"remove_default_node_pool": null,
"resource_labels": {
"test-resource_labels-key": "test-resource_labels-value"
},
"resource_usage_export_config": [],
"subnetwork": "test-subnetwork",
"timeouts": null,
"vertical_pod_autoscaling": []
},
"after_unknown": {
"additional_zones": true,
"addons_config": [
{
"cloudrun_config": true,
"horizontal_pod_autoscaling": [
{}
],
"http_load_balancing": [
{}
],
"kubernetes_dashboard": true,
"network_policy_config": [
{}
]
Expand All @@ -320,17 +321,18 @@
"authenticator_groups_config": true,
"cluster_autoscaling": true,
"cluster_ipv4_cidr": true,
"database_encryption": true,
"datapath_provider": true,
"default_snat_status": true,
"enable_intranode_visibility": true,
"enable_tpu": true,
"enable_shielded_nodes": true,
"endpoint": true,
"id": true,
"instance_group_urls": true,
"ip_allocation_policy": [
{
"cluster_ipv4_cidr_block": true,
"node_ipv4_cidr_block": true,
"services_ipv4_cidr_block": true,
"subnetwork_name": true
"services_ipv4_cidr_block": true
}
],
"label_fingerprint": true,
Expand All @@ -340,7 +342,9 @@
{
"duration": true
}
]
],
"maintenance_exclusion": [],
"recurring_window": []
}
],
"master_auth": [
Expand All @@ -365,6 +369,7 @@
"network_policy": [
{}
],
"networking_mode": true,
"node_config": [
{
"guest_accelerator": [
Expand All @@ -377,7 +382,6 @@
false,
false
],
"sandbox_config": true,
"shielded_instance_config": true,
"tags": [
false
Expand All @@ -391,20 +395,25 @@
],
"node_pool": true,
"operation": true,
"pod_security_policy_config": true,
"pod_security_policy_config": [],
"private_cluster_config": [
{
"master_global_access_config": true,
"peering_name": true,
"private_endpoint": true,
"public_endpoint": true
}
],
"private_ipv6_google_access": true,
"project": true,
"region": true,
"release_channel": true,
"resource_labels": {},
"resource_usage_export_config": [],
"self_link": true,
"services_ipv4_cidr": true,
"tpu_ipv4_cidr_block": true,
"vertical_pod_autoscaling": [],
"zone": true
"workload_identity_config": true
}
}
}
Expand Down Expand Up @@ -617,16 +626,6 @@
}
}
],
"workload_identity_config": [
{
"identity_namespace": {
"constant_value": true
}
}
],
"remove_default_node_pool": {
"constant_value": true
},
"resource_labels": {
"constant_value": {
"test-resource_labels-key": "test-resource_labels-value"
Expand Down

0 comments on commit c73e3fc

Please sign in to comment.