Merge branch 'master' into bugfix/2141-create_ignore_already_exists

apeabody · web-flow · commit af86d91bf746 · 2024-10-23T10:48:08.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ EOF`
`44`	`44`	`]`
`45`	`45`	`}`
`46`	`46`
`47`		`-resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" {`
	`47`	`+resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" {`
`48`	`48`	`count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0`
`49`	`49`
`50`	`50`	`metadata {`
`@@ -68,6 +68,12 @@ EOF`
`68`	`68`	`]`
`69`	`69`	`}`
`70`	`70`
	`71`	`+# Fix the name typo in the previous ConfigMap creation call`
	`72`	`+moved {`
	`73`	`+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers`
	`74`	`+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers`
	`75`	`+}`
	`76`	`+`
`71`	`77`	`resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" {`
`72`	`78`	`count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0`
`73`	`79`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ EOF`
`42`	`42`	`]`
`43`	`43`	`}`
`44`	`44`
`45`		`-resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" {`
	`45`	`+resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" {`
`46`	`46`	`count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0`
`47`	`47`
`48`	`48`	`metadata {`
`@@ -64,6 +64,12 @@ EOF`
`64`	`64`	`]`
`65`	`65`	`}`
`66`	`66`
	`67`	`+# Fix the name typo in the previous ConfigMap creation call`
	`68`	`+moved {`
	`69`	`+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers`
	`70`	`+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers`
	`71`	`+}`
	`72`	`+`
`67`	`73`	`resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" {`
`68`	`74`	`count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0`
`69`	`75`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ EOF`
`41`	`41`	`]`
`42`	`42`	`}`
`43`	`43`
`44`		`-resource "kubernetes_config_map_v1_data" "kube-dns-upstream-namservers" {`
	`44`	`+resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" {`
`45`	`45`	`count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0`
`46`	`46`
`47`	`47`	`metadata {`
`@@ -62,6 +62,12 @@ EOF`
`62`	`62`	`]`
`63`	`63`	`}`
`64`	`64`
	`65`	`+# Fix the name typo in the previous ConfigMap creation call`
	`66`	`+moved {`
	`67`	`+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers`
	`68`	`+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers`
	`69`	`+}`
	`70`	`+`
`65`	`71`	`resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" {`
`66`	`72`	`count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0`
`67`	`73`