ignore dns servers from dhcp when providing nameservers

Co-authored-by: Tyler Schultz <tschultz@vmware.com> Co-authored-by: Edwin Xie <exie@vmware.com> Co-authored-by: Christian Ang <angc@vmware.com>
vmware-tanzu · Dec 13, 2022 · 98dd506 · 98dd506
1 parent 30e868d
commit 98dd506
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 8 deletions.
diff --git a/packages/tkg-clusterclass-vsphere/bundle/config/upstream/base.yaml b/packages/tkg-clusterclass-vsphere/bundle/config/upstream/base.yaml
@@ -1087,8 +1087,20 @@ spec:
               - {{ . }}
                 {{- end }}
               {{- end }}
-              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp4: true {{- end }}
-              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp6: true {{- end }}
+              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp4: true
+              {{ if .controlPlane.network.nameservers -}}
+              dhcp4Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
+              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp6: true
+              {{ if .controlPlane.network.nameservers -}}
+              dhcp6Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
               {{ if .network.addressesFromPools  -}}
               addressesFromPools:
                 {{- range .network.addressesFromPools }}
@@ -1124,8 +1136,20 @@ spec:
               - {{ . }}
                 {{- end }}
               {{- end }}
-              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp4: true {{- end }}
-              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp6: true {{- end }}
+              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp4: true
+              {{ if .worker.network.nameservers -}}
+              dhcp4Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
+              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp6: true
+              {{ if .worker.network.nameservers -}}
+              dhcp6Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
               {{ if .network.addressesFromPools  -}}
               addressesFromPools:
                 {{- range .network.addressesFromPools }}

diff --git a/providers/infrastructure-vsphere/v1.5.1/cconly/base.yaml b/providers/infrastructure-vsphere/v1.5.1/cconly/base.yaml
@@ -1087,8 +1087,20 @@ spec:
               - {{ . }}
                 {{- end }}
               {{- end }}
-              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp4: true {{- end }}
-              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp6: true {{- end }}
+              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp4: true
+              {{ if .controlPlane.network.nameservers -}}
+              dhcp4Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
+              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp6: true
+              {{ if .controlPlane.network.nameservers -}}
+              dhcp6Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
               {{ if .network.addressesFromPools  -}}
               addressesFromPools:
                 {{- range .network.addressesFromPools }}
@@ -1124,8 +1136,20 @@ spec:
               - {{ . }}
                 {{- end }}
               {{- end }}
-              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp4: true {{- end }}
-              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}} dhcp6: true {{- end }}
+              {{ if list "IPv4" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp4: true
+              {{ if .worker.network.nameservers -}}
+              dhcp4Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
+              {{ if list "IPv6" "DualStack" | has .builtin.cluster.network.ipFamily | and (empty .network.addressesFromPools) -}}
+              dhcp6: true
+              {{ if .worker.network.nameservers -}}
+              dhcp6Overrides:
+                useDNS: false
+              {{- end }}
+              {{- end }}
               {{ if .network.addressesFromPools  -}}
               addressesFromPools:
                 {{- range .network.addressesFromPools }}