Made DNSPolicy configurable regardless of hostNetwork options

ytsaurus · Jan 13, 2025 · 4b33462 · 4b33462
1 parent 24268af
commit 4b33462
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/components/server.go b/pkg/components/server.go
@@ -352,14 +352,16 @@ func (s *serverImpl) rebuildStatefulSet() *appsv1.StatefulSet {
 		DNSConfig:    s.instanceSpec.DNSConfig,
 	}
 
+	var stsDNSPolicy corev1.DNSPolicy
 	if ptr.Deref(s.instanceSpec.HostNetwork, s.commonSpec.HostNetwork) {
 		statefulSet.Spec.Template.Spec.HostNetwork = true
-		if s.instanceSpec.DNSPolicy != "" {
-			statefulSet.Spec.Template.Spec.DNSPolicy = s.instanceSpec.DNSPolicy
-		} else {
-			statefulSet.Spec.Template.Spec.DNSPolicy = corev1.DNSClusterFirstWithHostNet
-		}
+		// https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
+		stsDNSPolicy = corev1.DNSClusterFirstWithHostNet
+	}
+	if s.instanceSpec.DNSPolicy != "" {
+		stsDNSPolicy = s.instanceSpec.DNSPolicy
 	}
+	statefulSet.Spec.Template.Spec.DNSPolicy = stsDNSPolicy
 
 	if s.caBundle != nil {
 		s.caBundle.AddVolume(&statefulSet.Spec.Template.Spec)