From 843c56cef4157a3bcc281a8bd08021baa733dae1 Mon Sep 17 00:00:00 2001 From: Maxim Fedchishin Date: Wed, 23 Oct 2024 10:43:24 -0700 Subject: [PATCH] fix: fix typo in kube-dns-upstream-nameservers configmap (#2149) --- autogen/main/dns.tf.tmpl | 8 +++++++- dns.tf | 8 +++++++- modules/beta-autopilot-private-cluster/dns.tf | 8 +++++++- modules/beta-autopilot-public-cluster/dns.tf | 8 +++++++- modules/beta-private-cluster-update-variant/dns.tf | 8 +++++++- modules/beta-private-cluster/dns.tf | 8 +++++++- modules/beta-public-cluster-update-variant/dns.tf | 8 +++++++- modules/beta-public-cluster/dns.tf | 8 +++++++- modules/private-cluster-update-variant/dns.tf | 8 +++++++- modules/private-cluster/dns.tf | 8 +++++++- 10 files changed, 70 insertions(+), 10 deletions(-) diff --git a/autogen/main/dns.tf.tmpl b/autogen/main/dns.tf.tmpl index b9db91ca2e..d4565374c8 100644 --- a/autogen/main/dns.tf.tmpl +++ b/autogen/main/dns.tf.tmpl @@ -44,7 +44,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -68,6 +68,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/dns.tf b/dns.tf index bf0d05b723..e0e7a53cb4 100644 --- a/dns.tf +++ b/dns.tf @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,6 +64,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/beta-autopilot-private-cluster/dns.tf b/modules/beta-autopilot-private-cluster/dns.tf index d9c4d7518f..289691bfd1 100644 --- a/modules/beta-autopilot-private-cluster/dns.tf +++ b/modules/beta-autopilot-private-cluster/dns.tf @@ -41,7 +41,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -62,6 +62,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/beta-autopilot-public-cluster/dns.tf b/modules/beta-autopilot-public-cluster/dns.tf index d9c4d7518f..289691bfd1 100644 --- a/modules/beta-autopilot-public-cluster/dns.tf +++ b/modules/beta-autopilot-public-cluster/dns.tf @@ -41,7 +41,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -62,6 +62,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/beta-private-cluster-update-variant/dns.tf b/modules/beta-private-cluster-update-variant/dns.tf index bf0d05b723..e0e7a53cb4 100644 --- a/modules/beta-private-cluster-update-variant/dns.tf +++ b/modules/beta-private-cluster-update-variant/dns.tf @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,6 +64,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/beta-private-cluster/dns.tf b/modules/beta-private-cluster/dns.tf index bf0d05b723..e0e7a53cb4 100644 --- a/modules/beta-private-cluster/dns.tf +++ b/modules/beta-private-cluster/dns.tf @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,6 +64,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/beta-public-cluster-update-variant/dns.tf b/modules/beta-public-cluster-update-variant/dns.tf index bf0d05b723..e0e7a53cb4 100644 --- a/modules/beta-public-cluster-update-variant/dns.tf +++ b/modules/beta-public-cluster-update-variant/dns.tf @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,6 +64,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/beta-public-cluster/dns.tf b/modules/beta-public-cluster/dns.tf index bf0d05b723..e0e7a53cb4 100644 --- a/modules/beta-public-cluster/dns.tf +++ b/modules/beta-public-cluster/dns.tf @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,6 +64,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/private-cluster-update-variant/dns.tf b/modules/private-cluster-update-variant/dns.tf index bf0d05b723..e0e7a53cb4 100644 --- a/modules/private-cluster-update-variant/dns.tf +++ b/modules/private-cluster-update-variant/dns.tf @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,6 +64,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 diff --git a/modules/private-cluster/dns.tf b/modules/private-cluster/dns.tf index bf0d05b723..e0e7a53cb4 100644 --- a/modules/private-cluster/dns.tf +++ b/modules/private-cluster/dns.tf @@ -42,7 +42,7 @@ EOF ] } -resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" { +resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" { count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0 metadata { @@ -64,6 +64,12 @@ 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" { count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0