Merge pull request #5427 from cybertron/disable-internal-dns

OPNET-678: Allow disabling internal DNS records

Author: openshift-merge-bot[bot]

go.mod

@@ -37,7 +37,7 @@ require (
 	github.com/onsi/gomega v1.36.2
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835
-	github.com/openshift/api v0.0.0-20251104141128-d13e8c65d30f
+	github.com/openshift/api v0.0.0-20251119073004-138912d4ee99
 	github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
 	github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5
 	github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b

go.sum

@@ -609,8 +609,8 @@ github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplU
 github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
 github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835 h1:rkqIIfdYYkasXbF2XKVgh/3f1mhjSQK9By8WtVMgYo8=
 github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
-github.com/openshift/api v0.0.0-20251104141128-d13e8c65d30f h1:xiSyW0ZZ0XWBiZ2ko7e/jI6N0m2DuwZqsSO4NHh/4T8=
-github.com/openshift/api v0.0.0-20251104141128-d13e8c65d30f/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
+github.com/openshift/api v0.0.0-20251119073004-138912d4ee99 h1:VGkPn3iO7ZapVYtUd7Lj1tE2ZwRfOOUVFzoA/sWlWDc=
+github.com/openshift/api v0.0.0-20251119073004-138912d4ee99/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
 github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 h1:9JBeIXmnHlpXTQPi7LPmu1jdxznBhAE7bb1K+3D8gxY=
 github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235/go.mod h1:L49W6pfrZkfOE5iC1PqEkuLkXG4W0BX4w8b+L2Bv7fM=
 github.com/openshift/kubernetes v1.30.1-0.20251028145634-9e794b89909a h1:uaeiYAYOVlXChnGxvsziVTkzaSlBV7h8Y2U2Bc81UKM=

pkg/controller/template/render.go

@@ -387,6 +387,7 @@ func renderTemplate(config RenderConfig, path string, b []byte) ([]byte, error)
 	funcs["urlHost"] = urlHost
 	funcs["urlPort"] = urlPort
 	funcs["isOpenShiftManagedDefaultLB"] = isOpenShiftManagedDefaultLB
+	funcs["dnsRecordsType"] = dnsRecordsType
 	funcs["cloudPlatformAPIIntLoadBalancerIPs"] = cloudPlatformAPIIntLoadBalancerIPs
 	funcs["cloudPlatformAPILoadBalancerIPs"] = cloudPlatformAPILoadBalancerIPs
 	funcs["cloudPlatformIngressLoadBalancerIPs"] = cloudPlatformIngressLoadBalancerIPs
@@ -723,6 +724,33 @@ func isOpenShiftManagedDefaultLB(cfg RenderConfig) bool {
 	return false
 }
 
+func dnsRecordsType(cfg RenderConfig) configv1.DNSRecordsType {
+	if cfg.Infra.Status.PlatformStatus != nil {
+		switch cfg.Infra.Status.PlatformStatus.Type {
+		case configv1.BareMetalPlatformType:
+			if cfg.Infra.Status.PlatformStatus.BareMetal != nil {
+				return cfg.Infra.Status.PlatformStatus.BareMetal.DNSRecordsType
+			}
+		case configv1.NutanixPlatformType:
+			if cfg.Infra.Status.PlatformStatus.Nutanix != nil {
+				return cfg.Infra.Status.PlatformStatus.Nutanix.DNSRecordsType
+			}
+		case configv1.OpenStackPlatformType:
+			if cfg.Infra.Status.PlatformStatus.OpenStack != nil {
+				return cfg.Infra.Status.PlatformStatus.OpenStack.DNSRecordsType
+			}
+		case configv1.VSpherePlatformType:
+			// I'm intentionally not handling VSphere UPI because this should never
+			// be called on UPI, and even if it is the field is meaningless in that
+			// context and falling through to the default is fine.
+			if cfg.Infra.Status.PlatformStatus.VSphere != nil {
+				return cfg.Infra.Status.PlatformStatus.VSphere.DNSRecordsType
+			}
+		}
+	}
+	return "Internal"
+}
+
 // cloudPlatformLoadBalancerIPs provides a generic method to obtain API, API-Int and Ingrerss Load Balancer IPs
 func cloudPlatformLoadBalancerIPs(cfg RenderConfig, lbType LoadBalancerType) (interface{}, error) {
 	if cfg.Infra.Status.PlatformStatus != nil {

templates/common/on-prem/files/coredns-corefile.yaml

@@ -11,6 +11,7 @@ contents:
         }
         cache 30
         reload
+        {{ if ne (dnsRecordsType .) "External" }}
         template IN {{`{{ .Cluster.IngressVIPRecordType }}`}} {{ .DNS.Spec.BaseDomain }} {
             match .*[.]apps.{{ .DNS.Spec.BaseDomain }}
             answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ if gt (len (onPremPlatformIngressIPs .)) 0 }}{{ index (onPremPlatformIngressIPs .) 0 }}{{ end }}"
@@ -41,6 +42,7 @@ contents:
             {{ if gt (len (onPremPlatformAPIServerInternalIPs .)) 1 }}answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ index (onPremPlatformAPIServerInternalIPs .) 1 }}"{{ end }}
             fallthrough
         }
+        {{ end }}
         hosts {
             {{`{{- range .Cluster.NodeAddresses }}
             {{ .Address }} {{ .Name }} {{ .Name }}.{{ $.Cluster.Name }}.{{ $.Cluster.Domain }}