From 774fa09984d461206e12adcdb42930417cdb7e71 Mon Sep 17 00:00:00 2001 From: William Yardley Date: Wed, 23 Oct 2024 11:31:01 -0700 Subject: [PATCH 1/4] fix: update resource names to snake_case - Update resource names to snake_case - Add `moved` blocks for resources and consolidate into `moved.tf` --- autogen/main/dns.tf.tmpl | 12 ++--- autogen/main/masq.tf.tmpl | 2 +- autogen/main/moved.tf.tmpl | 46 +++++++++++++++++++ autogen/main/sa.tf.tmpl | 10 ++-- dns.tf | 12 ++--- masq.tf | 2 +- modules/beta-autopilot-private-cluster/dns.tf | 12 ++--- .../beta-autopilot-private-cluster/masq.tf | 2 +- .../beta-autopilot-private-cluster/moved.tf | 46 +++++++++++++++++++ modules/beta-autopilot-private-cluster/sa.tf | 10 ++-- modules/beta-autopilot-public-cluster/dns.tf | 12 ++--- modules/beta-autopilot-public-cluster/masq.tf | 2 +- .../beta-autopilot-public-cluster/moved.tf | 46 +++++++++++++++++++ modules/beta-autopilot-public-cluster/sa.tf | 10 ++-- .../dns.tf | 12 ++--- .../masq.tf | 2 +- .../moved.tf | 46 +++++++++++++++++++ .../beta-private-cluster-update-variant/sa.tf | 10 ++-- modules/beta-private-cluster/dns.tf | 12 ++--- modules/beta-private-cluster/masq.tf | 2 +- modules/beta-private-cluster/moved.tf | 46 +++++++++++++++++++ modules/beta-private-cluster/sa.tf | 10 ++-- .../beta-public-cluster-update-variant/dns.tf | 12 ++--- .../masq.tf | 2 +- .../moved.tf | 46 +++++++++++++++++++ .../beta-public-cluster-update-variant/sa.tf | 10 ++-- modules/beta-public-cluster/dns.tf | 12 ++--- modules/beta-public-cluster/masq.tf | 2 +- modules/beta-public-cluster/moved.tf | 46 +++++++++++++++++++ modules/beta-public-cluster/sa.tf | 10 ++-- modules/private-cluster-update-variant/dns.tf | 12 ++--- .../private-cluster-update-variant/masq.tf | 2 +- .../private-cluster-update-variant/moved.tf | 46 +++++++++++++++++++ modules/private-cluster-update-variant/sa.tf | 10 ++-- modules/private-cluster/dns.tf | 12 ++--- modules/private-cluster/masq.tf | 2 +- modules/private-cluster/moved.tf | 46 +++++++++++++++++++ modules/private-cluster/sa.tf | 10 ++-- moved.tf | 46 +++++++++++++++++++ sa.tf | 10 ++-- 40 files changed, 550 insertions(+), 150 deletions(-) create mode 100644 autogen/main/moved.tf.tmpl create mode 100644 modules/beta-autopilot-private-cluster/moved.tf create mode 100644 modules/beta-autopilot-public-cluster/moved.tf create mode 100644 modules/beta-private-cluster-update-variant/moved.tf create mode 100644 modules/beta-private-cluster/moved.tf create mode 100644 modules/beta-public-cluster-update-variant/moved.tf create mode 100644 modules/beta-public-cluster/moved.tf create mode 100644 modules/private-cluster-update-variant/moved.tf create mode 100644 modules/private-cluster/moved.tf create mode 100644 moved.tf diff --git a/autogen/main/dns.tf.tmpl b/autogen/main/dns.tf.tmpl index d4565374c8..bb472c1416 100644 --- a/autogen/main/dns.tf.tmpl +++ b/autogen/main/dns.tf.tmpl @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -44,7 +44,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -68,13 +68,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/autogen/main/masq.tf.tmpl b/autogen/main/masq.tf.tmpl index 28d9b602a1..3d3129fe50 100644 --- a/autogen/main/masq.tf.tmpl +++ b/autogen/main/masq.tf.tmpl @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/autogen/main/moved.tf.tmpl b/autogen/main/moved.tf.tmpl new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/autogen/main/moved.tf.tmpl @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/autogen/main/sa.tf.tmpl b/autogen/main/sa.tf.tmpl index f0cfb0b19d..bf1beb8f69 100644 --- a/autogen/main/sa.tf.tmpl +++ b/autogen/main/sa.tf.tmpl @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/dns.tf b/dns.tf index e0e7a53cb4..c120c2be92 100644 --- a/dns.tf +++ b/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,13 +64,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/masq.tf b/masq.tf index b356aee251..cbb862d720 100644 --- a/masq.tf +++ b/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/beta-autopilot-private-cluster/dns.tf b/modules/beta-autopilot-private-cluster/dns.tf index 289691bfd1..b23714a870 100644 --- a/modules/beta-autopilot-private-cluster/dns.tf +++ b/modules/beta-autopilot-private-cluster/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -41,7 +41,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -62,13 +62,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/beta-autopilot-private-cluster/masq.tf b/modules/beta-autopilot-private-cluster/masq.tf index 65d3cc83c3..617d6afb9f 100644 --- a/modules/beta-autopilot-private-cluster/masq.tf +++ b/modules/beta-autopilot-private-cluster/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/beta-autopilot-private-cluster/moved.tf b/modules/beta-autopilot-private-cluster/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/beta-autopilot-private-cluster/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/beta-autopilot-private-cluster/sa.tf b/modules/beta-autopilot-private-cluster/sa.tf index 34106c5e62..8082a60312 100644 --- a/modules/beta-autopilot-private-cluster/sa.tf +++ b/modules/beta-autopilot-private-cluster/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/modules/beta-autopilot-public-cluster/dns.tf b/modules/beta-autopilot-public-cluster/dns.tf index 289691bfd1..b23714a870 100644 --- a/modules/beta-autopilot-public-cluster/dns.tf +++ b/modules/beta-autopilot-public-cluster/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -41,7 +41,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -62,13 +62,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/beta-autopilot-public-cluster/masq.tf b/modules/beta-autopilot-public-cluster/masq.tf index 65d3cc83c3..617d6afb9f 100644 --- a/modules/beta-autopilot-public-cluster/masq.tf +++ b/modules/beta-autopilot-public-cluster/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/beta-autopilot-public-cluster/moved.tf b/modules/beta-autopilot-public-cluster/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/beta-autopilot-public-cluster/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/beta-autopilot-public-cluster/sa.tf b/modules/beta-autopilot-public-cluster/sa.tf index 34106c5e62..8082a60312 100644 --- a/modules/beta-autopilot-public-cluster/sa.tf +++ b/modules/beta-autopilot-public-cluster/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/modules/beta-private-cluster-update-variant/dns.tf b/modules/beta-private-cluster-update-variant/dns.tf index e0e7a53cb4..c120c2be92 100644 --- a/modules/beta-private-cluster-update-variant/dns.tf +++ b/modules/beta-private-cluster-update-variant/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,13 +64,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/beta-private-cluster-update-variant/masq.tf b/modules/beta-private-cluster-update-variant/masq.tf index b356aee251..cbb862d720 100644 --- a/modules/beta-private-cluster-update-variant/masq.tf +++ b/modules/beta-private-cluster-update-variant/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/beta-private-cluster-update-variant/moved.tf b/modules/beta-private-cluster-update-variant/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/beta-private-cluster-update-variant/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/beta-private-cluster-update-variant/sa.tf b/modules/beta-private-cluster-update-variant/sa.tf index 34106c5e62..8082a60312 100644 --- a/modules/beta-private-cluster-update-variant/sa.tf +++ b/modules/beta-private-cluster-update-variant/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/modules/beta-private-cluster/dns.tf b/modules/beta-private-cluster/dns.tf index e0e7a53cb4..c120c2be92 100644 --- a/modules/beta-private-cluster/dns.tf +++ b/modules/beta-private-cluster/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,13 +64,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/beta-private-cluster/masq.tf b/modules/beta-private-cluster/masq.tf index b356aee251..cbb862d720 100644 --- a/modules/beta-private-cluster/masq.tf +++ b/modules/beta-private-cluster/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/beta-private-cluster/moved.tf b/modules/beta-private-cluster/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/beta-private-cluster/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/beta-private-cluster/sa.tf b/modules/beta-private-cluster/sa.tf index 34106c5e62..8082a60312 100644 --- a/modules/beta-private-cluster/sa.tf +++ b/modules/beta-private-cluster/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/modules/beta-public-cluster-update-variant/dns.tf b/modules/beta-public-cluster-update-variant/dns.tf index e0e7a53cb4..c120c2be92 100644 --- a/modules/beta-public-cluster-update-variant/dns.tf +++ b/modules/beta-public-cluster-update-variant/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,13 +64,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/beta-public-cluster-update-variant/masq.tf b/modules/beta-public-cluster-update-variant/masq.tf index b356aee251..cbb862d720 100644 --- a/modules/beta-public-cluster-update-variant/masq.tf +++ b/modules/beta-public-cluster-update-variant/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/beta-public-cluster-update-variant/moved.tf b/modules/beta-public-cluster-update-variant/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/beta-public-cluster-update-variant/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/beta-public-cluster-update-variant/sa.tf b/modules/beta-public-cluster-update-variant/sa.tf index 34106c5e62..8082a60312 100644 --- a/modules/beta-public-cluster-update-variant/sa.tf +++ b/modules/beta-public-cluster-update-variant/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/modules/beta-public-cluster/dns.tf b/modules/beta-public-cluster/dns.tf index e0e7a53cb4..c120c2be92 100644 --- a/modules/beta-public-cluster/dns.tf +++ b/modules/beta-public-cluster/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,13 +64,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/beta-public-cluster/masq.tf b/modules/beta-public-cluster/masq.tf index b356aee251..cbb862d720 100644 --- a/modules/beta-public-cluster/masq.tf +++ b/modules/beta-public-cluster/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/beta-public-cluster/moved.tf b/modules/beta-public-cluster/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/beta-public-cluster/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/beta-public-cluster/sa.tf b/modules/beta-public-cluster/sa.tf index 34106c5e62..8082a60312 100644 --- a/modules/beta-public-cluster/sa.tf +++ b/modules/beta-public-cluster/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/modules/private-cluster-update-variant/dns.tf b/modules/private-cluster-update-variant/dns.tf index e0e7a53cb4..c120c2be92 100644 --- a/modules/private-cluster-update-variant/dns.tf +++ b/modules/private-cluster-update-variant/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,13 +64,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/private-cluster-update-variant/masq.tf b/modules/private-cluster-update-variant/masq.tf index b356aee251..cbb862d720 100644 --- a/modules/private-cluster-update-variant/masq.tf +++ b/modules/private-cluster-update-variant/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/private-cluster-update-variant/moved.tf b/modules/private-cluster-update-variant/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/private-cluster-update-variant/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/private-cluster-update-variant/sa.tf b/modules/private-cluster-update-variant/sa.tf index 72d044a4c9..a8923ce1db 100644 --- a/modules/private-cluster-update-variant/sa.tf +++ b/modules/private-cluster-update-variant/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/modules/private-cluster/dns.tf b/modules/private-cluster/dns.tf index e0e7a53cb4..c120c2be92 100644 --- a/modules/private-cluster/dns.tf +++ b/modules/private-cluster/dns.tf @@ -20,7 +20,7 @@ Manage kube-dns configmaps *****************************************/ -resource "kubernetes_config_map_v1_data" "kube-dns" { +resource "kubernetes_config_map_v1_data" "kube_dns" { count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0 metadata { @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,13 +64,7 @@ EOF ] } -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" { +resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { diff --git a/modules/private-cluster/masq.tf b/modules/private-cluster/masq.tf index b356aee251..cbb862d720 100644 --- a/modules/private-cluster/masq.tf +++ b/modules/private-cluster/masq.tf @@ -19,7 +19,7 @@ /****************************************** Create ip-masq-agent confimap *****************************************/ -resource "kubernetes_config_map" "ip-masq-agent" { +resource "kubernetes_config_map" "ip_masq_agent" { count = var.configure_ip_masq ? 1 : 0 metadata { diff --git a/modules/private-cluster/moved.tf b/modules/private-cluster/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/modules/private-cluster/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/modules/private-cluster/sa.tf b/modules/private-cluster/sa.tf index 72d044a4c9..a8923ce1db 100644 --- a/modules/private-cluster/sa.tf +++ b/modules/private-cluster/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" diff --git a/moved.tf b/moved.tf new file mode 100644 index 0000000000..b37d7f66f2 --- /dev/null +++ b/moved.tf @@ -0,0 +1,46 @@ +# Fix the name typo in the previous ConfigMap creation call +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers + to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers +} + +# Updates for kebab to snake case, to match best practices and Google style. +moved { + from = kubernetes_config_map_v1_data.kube-dns + to = kubernetes_config_map_v1_data.kube_dns +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers +} + +moved { + from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains + to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains +} + +moved { + from = google_project_iam_member.cluster_service_account-nodeService_account + to = google_project_iam_member.cluster_service_account_node_service_account +} + +moved { + from = google_project_iam_member.cluster_service_account-metric_writer + to = google_project_iam_member.cluster_service_account_metric_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-resourceMetadata-writer + to = google_project_iam_member.cluster_service_account_resource_metadata_writer +} + +moved { + from = google_project_iam_member.cluster_service_account-gcr + to = google_project_iam_member.cluster_service_account_gcr +} + +moved { + from = google_project_iam_member.cluster_service_account-artifact-registry + to = google_project_iam_member.cluster_service_account_artifact_registry +} diff --git a/sa.tf b/sa.tf index 72d044a4c9..a8923ce1db 100644 --- a/sa.tf +++ b/sa.tf @@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" { display_name = "Terraform-managed service account for cluster ${var.name}" } -resource "google_project_iam_member" "cluster_service_account-nodeService_account" { +resource "google_project_iam_member" "cluster_service_account_node_service_account" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/container.defaultNodeServiceAccount" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-metric_writer" { +resource "google_project_iam_member" "cluster_service_account_metric_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/monitoring.metricWriter" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" { +resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" { count = var.create_service_account ? 1 : 0 project = google_service_account.cluster_service_account[0].project role = "roles/stackdriver.resourceMetadata.writer" member = google_service_account.cluster_service_account[0].member } -resource "google_project_iam_member" "cluster_service_account-gcr" { +resource "google_project_iam_member" "cluster_service_account_gcr" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/storage.objectViewer" member = "serviceAccount:${google_service_account.cluster_service_account[0].email}" } -resource "google_project_iam_member" "cluster_service_account-artifact-registry" { +resource "google_project_iam_member" "cluster_service_account_artifact_registry" { for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : [] project = each.key role = "roles/artifactregistry.reader" From 896d632251a64f16a402f36d3f1a0947a5588cec Mon Sep 17 00:00:00 2001 From: William Yardley Date: Wed, 23 Oct 2024 11:44:53 -0700 Subject: [PATCH 2/4] add headers --- autogen/main/moved.tf.tmpl | 16 ++++++++++++++++ modules/beta-autopilot-private-cluster/moved.tf | 16 ++++++++++++++++ modules/beta-autopilot-public-cluster/moved.tf | 16 ++++++++++++++++ .../beta-private-cluster-update-variant/moved.tf | 16 ++++++++++++++++ modules/beta-private-cluster/moved.tf | 16 ++++++++++++++++ .../beta-public-cluster-update-variant/moved.tf | 16 ++++++++++++++++ modules/beta-public-cluster/moved.tf | 16 ++++++++++++++++ modules/private-cluster-update-variant/moved.tf | 16 ++++++++++++++++ modules/private-cluster/moved.tf | 16 ++++++++++++++++ moved.tf | 16 ++++++++++++++++ 10 files changed, 160 insertions(+) diff --git a/autogen/main/moved.tf.tmpl b/autogen/main/moved.tf.tmpl index b37d7f66f2..ad86085789 100644 --- a/autogen/main/moved.tf.tmpl +++ b/autogen/main/moved.tf.tmpl @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/beta-autopilot-private-cluster/moved.tf b/modules/beta-autopilot-private-cluster/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/beta-autopilot-private-cluster/moved.tf +++ b/modules/beta-autopilot-private-cluster/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/beta-autopilot-public-cluster/moved.tf b/modules/beta-autopilot-public-cluster/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/beta-autopilot-public-cluster/moved.tf +++ b/modules/beta-autopilot-public-cluster/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/beta-private-cluster-update-variant/moved.tf b/modules/beta-private-cluster-update-variant/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/beta-private-cluster-update-variant/moved.tf +++ b/modules/beta-private-cluster-update-variant/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/beta-private-cluster/moved.tf b/modules/beta-private-cluster/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/beta-private-cluster/moved.tf +++ b/modules/beta-private-cluster/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/beta-public-cluster-update-variant/moved.tf b/modules/beta-public-cluster-update-variant/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/beta-public-cluster-update-variant/moved.tf +++ b/modules/beta-public-cluster-update-variant/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/beta-public-cluster/moved.tf b/modules/beta-public-cluster/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/beta-public-cluster/moved.tf +++ b/modules/beta-public-cluster/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/private-cluster-update-variant/moved.tf b/modules/private-cluster-update-variant/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/private-cluster-update-variant/moved.tf +++ b/modules/private-cluster-update-variant/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/modules/private-cluster/moved.tf b/modules/private-cluster/moved.tf index b37d7f66f2..ad86085789 100644 --- a/modules/private-cluster/moved.tf +++ b/modules/private-cluster/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers diff --git a/moved.tf b/moved.tf index b37d7f66f2..ad86085789 100644 --- a/moved.tf +++ b/moved.tf @@ -1,3 +1,19 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + # Fix the name typo in the previous ConfigMap creation call moved { from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers From 2212fd9b363fdeca68cd77d3cda7b0460ccf80af Mon Sep 17 00:00:00 2001 From: William Yardley Date: Wed, 23 Oct 2024 15:43:54 -0700 Subject: [PATCH 3/4] typo and snake case move in the same moved block --- autogen/main/moved.tf.tmpl | 9 ++------- modules/beta-autopilot-private-cluster/moved.tf | 9 ++------- modules/beta-autopilot-public-cluster/moved.tf | 9 ++------- modules/beta-private-cluster-update-variant/moved.tf | 9 ++------- modules/beta-private-cluster/moved.tf | 9 ++------- modules/beta-public-cluster-update-variant/moved.tf | 9 ++------- modules/beta-public-cluster/moved.tf | 9 ++------- modules/private-cluster-update-variant/moved.tf | 9 ++------- modules/private-cluster/moved.tf | 9 ++------- moved.tf | 9 ++------- 10 files changed, 20 insertions(+), 70 deletions(-) diff --git a/autogen/main/moved.tf.tmpl b/autogen/main/moved.tf.tmpl index ad86085789..c417aa9fde 100644 --- a/autogen/main/moved.tf.tmpl +++ b/autogen/main/moved.tf.tmpl @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/beta-autopilot-private-cluster/moved.tf b/modules/beta-autopilot-private-cluster/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/beta-autopilot-private-cluster/moved.tf +++ b/modules/beta-autopilot-private-cluster/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/beta-autopilot-public-cluster/moved.tf b/modules/beta-autopilot-public-cluster/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/beta-autopilot-public-cluster/moved.tf +++ b/modules/beta-autopilot-public-cluster/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/beta-private-cluster-update-variant/moved.tf b/modules/beta-private-cluster-update-variant/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/beta-private-cluster-update-variant/moved.tf +++ b/modules/beta-private-cluster-update-variant/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/beta-private-cluster/moved.tf b/modules/beta-private-cluster/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/beta-private-cluster/moved.tf +++ b/modules/beta-private-cluster/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/beta-public-cluster-update-variant/moved.tf b/modules/beta-public-cluster-update-variant/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/beta-public-cluster-update-variant/moved.tf +++ b/modules/beta-public-cluster-update-variant/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/beta-public-cluster/moved.tf b/modules/beta-public-cluster/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/beta-public-cluster/moved.tf +++ b/modules/beta-public-cluster/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/private-cluster-update-variant/moved.tf b/modules/private-cluster-update-variant/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/private-cluster-update-variant/moved.tf +++ b/modules/private-cluster-update-variant/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/modules/private-cluster/moved.tf b/modules/private-cluster/moved.tf index ad86085789..c417aa9fde 100644 --- a/modules/private-cluster/moved.tf +++ b/modules/private-cluster/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } diff --git a/moved.tf b/moved.tf index ad86085789..c417aa9fde 100644 --- a/moved.tf +++ b/moved.tf @@ -14,20 +14,15 @@ * limitations under the License. */ -# Fix the name typo in the previous ConfigMap creation call -moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers - to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers -} - # Updates for kebab to snake case, to match best practices and Google style. moved { from = kubernetes_config_map_v1_data.kube-dns to = kubernetes_config_map_v1_data.kube_dns } +# Typo fix and snake case at the same time moved { - from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers + from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers } From d99321b7913723e3d94f8e12ee5d392b7f6b7776 Mon Sep 17 00:00:00 2001 From: William Yardley Date: Wed, 23 Oct 2024 17:02:59 -0700 Subject: [PATCH 4/4] add ip_masq_agent --- autogen/main/moved.tf.tmpl | 5 +++++ modules/beta-autopilot-private-cluster/moved.tf | 5 +++++ modules/beta-autopilot-public-cluster/moved.tf | 5 +++++ modules/beta-private-cluster-update-variant/moved.tf | 5 +++++ modules/beta-private-cluster/moved.tf | 5 +++++ modules/beta-public-cluster-update-variant/moved.tf | 5 +++++ modules/beta-public-cluster/moved.tf | 5 +++++ modules/private-cluster-update-variant/moved.tf | 5 +++++ modules/private-cluster/moved.tf | 5 +++++ moved.tf | 5 +++++ 10 files changed, 50 insertions(+) diff --git a/autogen/main/moved.tf.tmpl b/autogen/main/moved.tf.tmpl index c417aa9fde..a745d16489 100644 --- a/autogen/main/moved.tf.tmpl +++ b/autogen/main/moved.tf.tmpl @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/beta-autopilot-private-cluster/moved.tf b/modules/beta-autopilot-private-cluster/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/beta-autopilot-private-cluster/moved.tf +++ b/modules/beta-autopilot-private-cluster/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/beta-autopilot-public-cluster/moved.tf b/modules/beta-autopilot-public-cluster/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/beta-autopilot-public-cluster/moved.tf +++ b/modules/beta-autopilot-public-cluster/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/beta-private-cluster-update-variant/moved.tf b/modules/beta-private-cluster-update-variant/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/beta-private-cluster-update-variant/moved.tf +++ b/modules/beta-private-cluster-update-variant/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/beta-private-cluster/moved.tf b/modules/beta-private-cluster/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/beta-private-cluster/moved.tf +++ b/modules/beta-private-cluster/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/beta-public-cluster-update-variant/moved.tf b/modules/beta-public-cluster-update-variant/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/beta-public-cluster-update-variant/moved.tf +++ b/modules/beta-public-cluster-update-variant/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/beta-public-cluster/moved.tf b/modules/beta-public-cluster/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/beta-public-cluster/moved.tf +++ b/modules/beta-public-cluster/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/private-cluster-update-variant/moved.tf b/modules/private-cluster-update-variant/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/private-cluster-update-variant/moved.tf +++ b/modules/private-cluster-update-variant/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/modules/private-cluster/moved.tf b/modules/private-cluster/moved.tf index c417aa9fde..a745d16489 100644 --- a/modules/private-cluster/moved.tf +++ b/modules/private-cluster/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account diff --git a/moved.tf b/moved.tf index c417aa9fde..a745d16489 100644 --- a/moved.tf +++ b/moved.tf @@ -31,6 +31,11 @@ moved { to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains } +moved { + from = kubernetes_config_map.ip-masq-agent + to = kubernetes_config_map.ip_masq_agent +} + moved { from = google_project_iam_member.cluster_service_account-nodeService_account to = google_project_iam_member.cluster_service_account_node_service_account