From a2fb1b51aca61d03a2081bc226ab01a641271ce6 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Fri, 19 Apr 2024 15:19:58 -0700
Subject: [PATCH] Remove DefaultHostNetworkHostPortsInPodTemplates gate

This behavior was deprecated in 1.28.
---
 pkg/apis/core/v1/defaults.go      |  6 ------
 pkg/apis/core/v1/defaults_test.go | 31 ++++---------------------------
 pkg/features/kube_features.go     | 11 -----------
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/pkg/apis/core/v1/defaults.go b/pkg/apis/core/v1/defaults.go
index 8b645ebf49d..10712dbe21d 100644
--- a/pkg/apis/core/v1/defaults.go
+++ b/pkg/apis/core/v1/defaults.go
@@ -228,12 +228,6 @@ func SetDefaults_PodSpec(obj *v1.PodSpec) {
 	if obj.RestartPolicy == "" {
 		obj.RestartPolicy = v1.RestartPolicyAlways
 	}
-	if utilfeature.DefaultFeatureGate.Enabled(features.DefaultHostNetworkHostPortsInPodTemplates) {
-		if obj.HostNetwork {
-			defaultHostNetworkPorts(&obj.Containers)
-			defaultHostNetworkPorts(&obj.InitContainers)
-		}
-	}
 	if obj.SecurityContext == nil {
 		obj.SecurityContext = &v1.PodSecurityContext{}
 	}
diff --git a/pkg/apis/core/v1/defaults_test.go b/pkg/apis/core/v1/defaults_test.go
index 5377a57010c..b269163e0ee 100644
--- a/pkg/apis/core/v1/defaults_test.go
+++ b/pkg/apis/core/v1/defaults_test.go
@@ -208,14 +208,8 @@ func testWorkloadDefaults(t *testing.T, featuresEnabled bool) {
 				".Spec.HostNetwork":                          "true",
 				".Spec.Containers[0].Ports[0].ContainerPort": "12345",
 			}
-			if utilfeature.DefaultFeatureGate.Enabled(features.DefaultHostNetworkHostPortsInPodTemplates) {
-				m[".Spec.Containers"] = `[{"name":"","ports":[{"hostPort":12345,"containerPort":12345,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","imagePullPolicy":"IfNotPresent"}]`
-				m[".Spec.Containers[0].Ports"] = `[{"hostPort":12345,"containerPort":12345,"protocol":"TCP"}]`
-				m[".Spec.Containers[0].Ports[0].HostPort"] = "12345"
-			} else {
-				m[".Spec.Containers"] = `[{"name":"","ports":[{"containerPort":12345,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","imagePullPolicy":"IfNotPresent"}]`
-				m[".Spec.Containers[0].Ports"] = `[{"containerPort":12345,"protocol":"TCP"}]`
-			}
+			m[".Spec.Containers"] = `[{"name":"","ports":[{"containerPort":12345,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","imagePullPolicy":"IfNotPresent"}]`
+			m[".Spec.Containers[0].Ports"] = `[{"containerPort":12345,"protocol":"TCP"}]`
 			for k, v := range expectedDefaults {
 				if _, found := m[k]; !found {
 					m[k] = v
@@ -379,40 +373,23 @@ func testPodDefaults(t *testing.T, featuresEnabled bool) {
 func TestPodHostNetworkDefaults(t *testing.T) {
 	cases := []struct {
 		name                 string
-		gate                 bool
 		hostNet              bool
 		expectPodDefault     bool
 		expectPodSpecDefault bool
 	}{{
-		name:                 "gate disabled, hostNetwork=false",
-		gate:                 false,
+		name:                 "hostNetwork=false",
 		hostNet:              false,
 		expectPodDefault:     false,
 		expectPodSpecDefault: false,
 	}, {
-		name:                 "gate disabled, hostNetwork=true",
-		gate:                 false,
+		name:                 "hostNetwork=true",
 		hostNet:              true,
 		expectPodDefault:     true,
 		expectPodSpecDefault: false,
-	}, {
-		name:                 "gate enabled, hostNetwork=false",
-		gate:                 true,
-		hostNet:              false,
-		expectPodDefault:     false,
-		expectPodSpecDefault: false,
-	}, {
-		name:                 "gate enabled, hostNetwork=true",
-		gate:                 true,
-		hostNet:              true,
-		expectPodDefault:     true,
-		expectPodSpecDefault: true,
 	}}
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.DefaultHostNetworkHostPortsInPodTemplates, tc.gate)()
-
 			const portNum = 12345
 			spec := v1.PodSpec{
 				HostNetwork: tc.hostNet,
diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index fcc7cb5c93f..4a1348457ec 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -187,15 +187,6 @@ const (
 	// Set the scheduled time as an annotation in the job.
 	CronJobsScheduledAnnotation featuregate.Feature = "CronJobsScheduledAnnotation"
 
-	// owner: @thockin
-	// deprecated: v1.28
-	//
-	// Changes when the default value of PodSpec.containers[].ports[].hostPort
-	// is assigned.  The default is to only set a default value in Pods.
-	// Enabling this means a default will be assigned even to embeddedPodSpecs
-	// (e.g. in a Deployment), which is the historical default.
-	DefaultHostNetworkHostPortsInPodTemplates featuregate.Feature = "DefaultHostNetworkHostPortsInPodTemplates"
-
 	// owner: @elezar
 	// kep: http://kep.k8s.io/4009
 	// alpha: v1.28
@@ -1040,8 +1031,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 
 	CronJobsScheduledAnnotation: {Default: true, PreRelease: featuregate.Beta},
 
-	DefaultHostNetworkHostPortsInPodTemplates: {Default: false, PreRelease: featuregate.Deprecated},
-
 	DisableCloudProviders: {Default: true, PreRelease: featuregate.Beta},
 
 	DisableKubeletCloudCredentialProviders: {Default: true, PreRelease: featuregate.Beta},