Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion autogen/main/dns.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/beta-autopilot-private-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/beta-autopilot-public-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/beta-private-cluster-update-variant/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/beta-private-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/beta-public-cluster-update-variant/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/beta-public-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/private-cluster-update-variant/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion modules/private-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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

Expand Down
Loading