diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 7366e8bc361..87dbb125d91 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -10898,7 +10898,7 @@
           "type": "string"
         },
         "nodeName": {
-          "description": "nodeName represents the name of the Node hosting this endpoint. This can be used to determine endpoints local to a Node.",
+          "description": "nodeName represents the name of the Node hosting this endpoint. This can be used to determine endpoints local to a Node. This field can be enabled with the EndpointSliceNodeName feature gate.",
           "type": "string"
         },
         "targetRef": {
@@ -10909,7 +10909,7 @@
           "additionalProperties": {
             "type": "string"
           },
-          "description": "topology contains arbitrary topology information associated with the endpoint. These key/value pairs must conform with the label format. https://kubernetes.io/docs/concepts/overview/working-with-objects/labels Topology may include a maximum of 16 key/value pairs. This includes, but is not limited to the following well known keys: * kubernetes.io/hostname: the value indicates the hostname of the node\n  where the endpoint is located. This should match the corresponding\n  node label.\n* topology.kubernetes.io/zone: the value indicates the zone where the\n  endpoint is located. This should match the corresponding node label.\n* topology.kubernetes.io/region: the value indicates the region where the\n  endpoint is located. This should match the corresponding node label.\nthis field will be deprecated in an upcoming release.",
+          "description": "topology contains arbitrary topology information associated with the endpoint. These key/value pairs must conform with the label format. https://kubernetes.io/docs/concepts/overview/working-with-objects/labels Topology may include a maximum of 16 key/value pairs. This includes, but is not limited to the following well known keys: * kubernetes.io/hostname: the value indicates the hostname of the node\n  where the endpoint is located. This should match the corresponding\n  node label.\n* topology.kubernetes.io/zone: the value indicates the zone where the\n  endpoint is located. This should match the corresponding node label.\n* topology.kubernetes.io/region: the value indicates the region where the\n  endpoint is located. This should match the corresponding node label.\nThis field is deprecated and will be removed in future api versions.",
           "type": "object"
         }
       },
@@ -10926,11 +10926,11 @@
           "type": "boolean"
         },
         "serving": {
-          "description": "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
+          "description": "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.",
           "type": "boolean"
         },
         "terminating": {
-          "description": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating.",
+          "description": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.",
           "type": "boolean"
         }
       },
diff --git a/pkg/apis/discovery/types.go b/pkg/apis/discovery/types.go
index 5d79683067b..1201d4abbc4 100644
--- a/pkg/apis/discovery/types.go
+++ b/pkg/apis/discovery/types.go
@@ -99,11 +99,12 @@ type Endpoint struct {
 	//   endpoint is located. This should match the corresponding node label.
 	// * topology.kubernetes.io/region: the value indicates the region where the
 	//   endpoint is located. This should match the corresponding node label.
-	// this field will be deprecated in an upcoming release.
+	// This field is deprecated and will be removed in future api versions.
 	// +optional
 	Topology map[string]string
 	// nodeName represents the name of the Node hosting this endpoint. This can
-	// be used to determine endpoints local to a Node.
+	// be used to determine endpoints local to a Node. This field can be enabled
+	// with the EndpointSliceNodeName feature gate.
 	// +optional
 	NodeName *string
 }
@@ -117,15 +118,18 @@ type EndpointConditions struct {
 	// "true" for terminating endpoints.
 	Ready *bool
 
-	// serving is identical to ready except that it is set regardless of the terminating
-	// state of endpoints. This condition should be set to true for a ready endpoint that
-	// is terminating. If nil, consumers should defer to the ready condition.
+	// serving is identical to ready except that it is set regardless of the
+	// terminating state of endpoints. This condition should be set to true for
+	// a ready endpoint that is terminating. If nil, consumers should defer to
+	// the ready condition. This field can be enabled with the
+	// EndpointSliceTerminatingCondition feature gate.
 	// +optional
 	Serving *bool
 
-	// terminating indicates that this endpoint is terminating. A nil value indicates an
-	// unknown state. Consumers should interpret this unknown state to mean that the
-	// endpoint is not terminating.
+	// terminating indicates that this endpoint is terminating. A nil value
+	// indicates an unknown state. Consumers should interpret this unknown state
+	// to mean that the endpoint is not terminating. This field can be enabled
+	// with the EndpointSliceTerminatingCondition feature gate.
 	// +optional
 	Terminating *bool
 }
diff --git a/pkg/apis/discovery/validation/BUILD b/pkg/apis/discovery/validation/BUILD
index 38cd42af359..1f1a470f8bc 100644
--- a/pkg/apis/discovery/validation/BUILD
+++ b/pkg/apis/discovery/validation/BUILD
@@ -9,13 +9,11 @@ go_library(
         "//pkg/apis/core:go_default_library",
         "//pkg/apis/core/validation:go_default_library",
         "//pkg/apis/discovery:go_default_library",
-        "//pkg/features:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/validation:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
     ],
 )
 
@@ -26,10 +24,7 @@ go_test(
     deps = [
         "//pkg/apis/core:go_default_library",
         "//pkg/apis/discovery:go_default_library",
-        "//pkg/features:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
-        "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
         "//vendor/k8s.io/utils/pointer:go_default_library",
     ],
 )
diff --git a/pkg/apis/discovery/validation/validation.go b/pkg/apis/discovery/validation/validation.go
index 71d5ca6cbb5..8499e7a696a 100644
--- a/pkg/apis/discovery/validation/validation.go
+++ b/pkg/apis/discovery/validation/validation.go
@@ -22,11 +22,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	apivalidation "k8s.io/kubernetes/pkg/apis/core/validation"
 	"k8s.io/kubernetes/pkg/apis/discovery"
-	"k8s.io/kubernetes/pkg/features"
 )
 
 var (
@@ -52,10 +50,10 @@ var (
 var ValidateEndpointSliceName = apimachineryvalidation.NameIsDNSSubdomain
 
 // ValidateEndpointSlice validates an EndpointSlice.
-func ValidateEndpointSlice(endpointSlice *discovery.EndpointSlice, allowNodeName bool) field.ErrorList {
+func ValidateEndpointSlice(endpointSlice *discovery.EndpointSlice) field.ErrorList {
 	allErrs := apivalidation.ValidateObjectMeta(&endpointSlice.ObjectMeta, true, ValidateEndpointSliceName, field.NewPath("metadata"))
 	allErrs = append(allErrs, validateAddressType(endpointSlice.AddressType)...)
-	allErrs = append(allErrs, validateEndpoints(endpointSlice.Endpoints, endpointSlice.AddressType, allowNodeName, field.NewPath("endpoints"))...)
+	allErrs = append(allErrs, validateEndpoints(endpointSlice.Endpoints, endpointSlice.AddressType, field.NewPath("endpoints"))...)
 	allErrs = append(allErrs, validatePorts(endpointSlice.Ports, field.NewPath("ports"))...)
 
 	return allErrs
@@ -63,33 +61,18 @@ func ValidateEndpointSlice(endpointSlice *discovery.EndpointSlice, allowNodeName
 
 // ValidateEndpointSliceCreate validates an EndpointSlice when it is created.
 func ValidateEndpointSliceCreate(endpointSlice *discovery.EndpointSlice) field.ErrorList {
-	// allow NodeName value if the feature gate is set.
-	allowNodeName := utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceNodeName)
-
-	return ValidateEndpointSlice(endpointSlice, allowNodeName)
+	return ValidateEndpointSlice(endpointSlice)
 }
 
 // ValidateEndpointSliceUpdate validates an EndpointSlice when it is updated.
 func ValidateEndpointSliceUpdate(newEndpointSlice, oldEndpointSlice *discovery.EndpointSlice) field.ErrorList {
-	// allow NodeName value if the feature gate is set.
-	allowNodeName := utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceNodeName)
-
-	if !allowNodeName {
-		for _, ep := range oldEndpointSlice.Endpoints {
-			if ep.NodeName != nil {
-				allowNodeName = true
-				break
-			}
-		}
-	}
-
-	allErrs := ValidateEndpointSlice(newEndpointSlice, allowNodeName)
+	allErrs := ValidateEndpointSlice(newEndpointSlice)
 	allErrs = append(allErrs, apivalidation.ValidateImmutableField(newEndpointSlice.AddressType, oldEndpointSlice.AddressType, field.NewPath("addressType"))...)
 
 	return allErrs
 }
 
-func validateEndpoints(endpoints []discovery.Endpoint, addrType discovery.AddressType, allowNodeName bool, fldPath *field.Path) field.ErrorList {
+func validateEndpoints(endpoints []discovery.Endpoint, addrType discovery.AddressType, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
 	if len(endpoints) > maxEndpoints {
@@ -122,12 +105,8 @@ func validateEndpoints(endpoints []discovery.Endpoint, addrType discovery.Addres
 
 		if endpoint.NodeName != nil {
 			nnPath := idxPath.Child("nodeName")
-			if allowNodeName {
-				for _, msg := range apivalidation.ValidateNodeName(*endpoint.NodeName, false) {
-					allErrs = append(allErrs, field.Invalid(nnPath, *endpoint.NodeName, msg))
-				}
-			} else {
-				allErrs = append(allErrs, field.Forbidden(nnPath, "may not be set unless EndpointSliceNodeName feature gate is enabled"))
+			for _, msg := range apivalidation.ValidateNodeName(*endpoint.NodeName, false) {
+				allErrs = append(allErrs, field.Invalid(nnPath, *endpoint.NodeName, msg))
 			}
 		}
 
diff --git a/pkg/apis/discovery/validation/validation_test.go b/pkg/apis/discovery/validation/validation_test.go
index 6457da08499..5c7d478eb7e 100644
--- a/pkg/apis/discovery/validation/validation_test.go
+++ b/pkg/apis/discovery/validation/validation_test.go
@@ -22,11 +22,8 @@ import (
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	featuregatetesting "k8s.io/component-base/featuregate/testing"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/apis/discovery"
-	"k8s.io/kubernetes/pkg/features"
 	utilpointer "k8s.io/utils/pointer"
 )
 
@@ -461,7 +458,7 @@ func TestValidateEndpointSlice(t *testing.T) {
 
 	for name, testCase := range testCases {
 		t.Run(name, func(t *testing.T) {
-			errs := ValidateEndpointSlice(testCase.endpointSlice, true)
+			errs := ValidateEndpointSlice(testCase.endpointSlice)
 			if len(errs) != testCase.expectedErrors {
 				t.Errorf("Expected %d errors, got %d errors: %v", testCase.expectedErrors, len(errs), errs)
 			}
@@ -496,8 +493,7 @@ func TestValidateEndpointSliceCreate(t *testing.T) {
 			},
 		},
 		"good-slice-node-name": {
-			expectedErrors:      0,
-			nodeNameGateEnabled: true,
+			expectedErrors: 0,
 			endpointSlice: &discovery.EndpointSlice{
 				ObjectMeta:  standardMeta,
 				AddressType: discovery.AddressTypeIPv4,
@@ -515,8 +511,7 @@ func TestValidateEndpointSliceCreate(t *testing.T) {
 
 		// expected failures
 		"bad-node-name": {
-			expectedErrors:      1,
-			nodeNameGateEnabled: true,
+			expectedErrors: 1,
 			endpointSlice: &discovery.EndpointSlice{
 				ObjectMeta:  standardMeta,
 				AddressType: discovery.AddressTypeIPv4,
@@ -531,23 +526,6 @@ func TestValidateEndpointSliceCreate(t *testing.T) {
 				}},
 			},
 		},
-		"node-name-disabled": {
-			expectedErrors:      1,
-			nodeNameGateEnabled: false,
-			endpointSlice: &discovery.EndpointSlice{
-				ObjectMeta:  standardMeta,
-				AddressType: discovery.AddressTypeIPv4,
-				Ports: []discovery.EndpointPort{{
-					Name:     utilpointer.StringPtr("http"),
-					Protocol: protocolPtr(api.ProtocolTCP),
-				}},
-				Endpoints: []discovery.Endpoint{{
-					Addresses: generateIPAddresses(1),
-					Hostname:  utilpointer.StringPtr("valid-123"),
-					NodeName:  utilpointer.StringPtr("valid-node-name"),
-				}},
-			},
-		},
 		"deprecated-address-type": {
 			expectedErrors: 1,
 			endpointSlice: &discovery.EndpointSlice{
@@ -579,8 +557,6 @@ func TestValidateEndpointSliceCreate(t *testing.T) {
 	}
 
 	for name, testCase := range testCases {
-		defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.EndpointSliceNodeName, testCase.nodeNameGateEnabled)()
-
 		t.Run(name, func(t *testing.T) {
 			errs := ValidateEndpointSliceCreate(testCase.endpointSlice)
 			if len(errs) != testCase.expectedErrors {
@@ -610,48 +586,9 @@ func TestValidateEndpointSliceUpdate(t *testing.T) {
 			},
 			expectedErrors: 0,
 		},
-		"node name set before + after, gate disabled": {
-			oldEndpointSlice: &discovery.EndpointSlice{
-				ObjectMeta:  standardMeta,
-				AddressType: discovery.AddressTypeIPv4,
-				Endpoints: []discovery.Endpoint{{
-					Addresses: []string{"10.1.2.3"},
-					NodeName:  utilpointer.StringPtr("foo"),
-				}},
-			},
-			newEndpointSlice: &discovery.EndpointSlice{
-				ObjectMeta:  standardMeta,
-				AddressType: discovery.AddressTypeIPv4,
-				Endpoints: []discovery.Endpoint{{
-					Addresses: []string{"10.1.2.3"},
-					NodeName:  utilpointer.StringPtr("foo"),
-				}},
-			},
-			expectedErrors: 0,
-		},
-		"node name set after, gate enabled": {
-			nodeNameGateEnabled: true,
-			oldEndpointSlice: &discovery.EndpointSlice{
-				ObjectMeta:  standardMeta,
-				AddressType: discovery.AddressTypeIPv4,
-				Endpoints: []discovery.Endpoint{{
-					Addresses: []string{"10.1.2.3"},
-				}},
-			},
-			newEndpointSlice: &discovery.EndpointSlice{
-				ObjectMeta:  standardMeta,
-				AddressType: discovery.AddressTypeIPv4,
-				Endpoints: []discovery.Endpoint{{
-					Addresses: []string{"10.1.2.3"},
-					NodeName:  utilpointer.StringPtr("foo"),
-				}},
-			},
-			expectedErrors: 0,
-		},
 
 		// expected errors
-		"invalide node name set after, gate enabled": {
-			nodeNameGateEnabled: true,
+		"invalide node name set": {
 			oldEndpointSlice: &discovery.EndpointSlice{
 				ObjectMeta:  standardMeta,
 				AddressType: discovery.AddressTypeIPv4,
@@ -669,25 +606,7 @@ func TestValidateEndpointSliceUpdate(t *testing.T) {
 			},
 			expectedErrors: 1,
 		},
-		"node name set after, gate disabled": {
-			nodeNameGateEnabled: false,
-			oldEndpointSlice: &discovery.EndpointSlice{
-				ObjectMeta:  standardMeta,
-				AddressType: discovery.AddressTypeIPv4,
-				Endpoints: []discovery.Endpoint{{
-					Addresses: []string{"10.1.2.3"},
-				}},
-			},
-			newEndpointSlice: &discovery.EndpointSlice{
-				ObjectMeta:  standardMeta,
-				AddressType: discovery.AddressTypeIPv4,
-				Endpoints: []discovery.Endpoint{{
-					Addresses: []string{"10.1.2.3"},
-					NodeName:  utilpointer.StringPtr("foo"),
-				}},
-			},
-			expectedErrors: 1,
-		},
+
 		"deprecated address type": {
 			expectedErrors: 1,
 			oldEndpointSlice: &discovery.EndpointSlice{
@@ -729,8 +648,6 @@ func TestValidateEndpointSliceUpdate(t *testing.T) {
 
 	for name, testCase := range testCases {
 		t.Run(name, func(t *testing.T) {
-			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.EndpointSliceNodeName, testCase.nodeNameGateEnabled)()
-
 			errs := ValidateEndpointSliceUpdate(testCase.newEndpointSlice, testCase.oldEndpointSlice)
 			if len(errs) != testCase.expectedErrors {
 				t.Errorf("Expected %d errors, got %d errors: %v", testCase.expectedErrors, len(errs), errs)
diff --git a/pkg/controller/endpointslice/reconciler_test.go b/pkg/controller/endpointslice/reconciler_test.go
index 95e88b2fa5f..522881dda83 100644
--- a/pkg/controller/endpointslice/reconciler_test.go
+++ b/pkg/controller/endpointslice/reconciler_test.go
@@ -917,6 +917,7 @@ func TestReconcileEndpointSlicesReplaceDeprecated(t *testing.T) {
 	namespace := "test"
 
 	svc, endpointMeta := newServiceAndEndpointMeta("foo", namespace)
+	// "IP" is a deprecated address type, ensuring that it is handled properly.
 	endpointMeta.AddressType = discovery.AddressType("IP")
 
 	existingSlices := []*discovery.EndpointSlice{}
diff --git a/pkg/controlplane/reconcilers/endpointsadapter_test.go b/pkg/controlplane/reconcilers/endpointsadapter_test.go
index 13a34aa5ffb..531b1e2a31c 100644
--- a/pkg/controlplane/reconcilers/endpointsadapter_test.go
+++ b/pkg/controlplane/reconcilers/endpointsadapter_test.go
@@ -232,6 +232,7 @@ func TestEndpointsAdapterUpdate(t *testing.T) {
 	// with one that has an IPv4 address type.
 	endpoints4, _ := generateEndpointsAndSlice("foo", "testing", []int{80}, []string{"10.1.2.7", "10.1.2.8"})
 	_, epSlice4IP := generateEndpointsAndSlice("foo", "testing", []int{80}, []string{"10.1.2.7", "10.1.2.8"})
+	// "IP" is a deprecated address type, ensuring that it is handled properly.
 	epSlice4IP.AddressType = discovery.AddressType("IP")
 	_, epSlice4IPv4 := generateEndpointsAndSlice("foo", "testing", []int{80}, []string{"10.1.2.7", "10.1.2.8"})
 
diff --git a/pkg/proxy/BUILD b/pkg/proxy/BUILD
index 8b3ac576e71..089a9d6df96 100644
--- a/pkg/proxy/BUILD
+++ b/pkg/proxy/BUILD
@@ -19,6 +19,7 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/proxy",
     deps = [
         "//pkg/api/v1/service:go_default_library",
+        "//pkg/features:go_default_library",
         "//pkg/proxy/config:go_default_library",
         "//pkg/proxy/metrics:go_default_library",
         "//pkg/proxy/util:go_default_library",
@@ -26,6 +27,7 @@ go_library(
         "//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//vendor/k8s.io/klog/v2:go_default_library",
         "//vendor/k8s.io/utils/net:go_default_library",
diff --git a/pkg/proxy/endpointslicecache.go b/pkg/proxy/endpointslicecache.go
index b049481a372..bb180adcfcd 100644
--- a/pkg/proxy/endpointslicecache.go
+++ b/pkg/proxy/endpointslicecache.go
@@ -26,8 +26,10 @@ import (
 	"k8s.io/api/core/v1"
 	discovery "k8s.io/api/discovery/v1beta1"
 	"k8s.io/apimachinery/pkg/types"
+	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
+	"k8s.io/kubernetes/pkg/features"
 	utilproxy "k8s.io/kubernetes/pkg/proxy/util"
 	utilnet "k8s.io/utils/net"
 )
@@ -76,6 +78,7 @@ type endpointSliceInfo struct {
 // Addresses and Topology are copied from EndpointSlice Endpoints.
 type endpointInfo struct {
 	Addresses []string
+	NodeName  *string
 	Topology  map[string]string
 }
 
@@ -120,10 +123,14 @@ func newEndpointSliceInfo(endpointSlice *discovery.EndpointSlice, remove bool) *
 	if !remove {
 		for _, endpoint := range endpointSlice.Endpoints {
 			if endpoint.Conditions.Ready == nil || *endpoint.Conditions.Ready {
-				esInfo.Endpoints = append(esInfo.Endpoints, &endpointInfo{
+				eInfo := endpointInfo{
 					Addresses: endpoint.Addresses,
 					Topology:  endpoint.Topology,
-				})
+				}
+				if utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceNodeName) {
+					eInfo.NodeName = endpoint.NodeName
+				}
+				esInfo.Endpoints = append(esInfo.Endpoints, &eInfo)
 			}
 		}
 
@@ -255,7 +262,13 @@ func (cache *EndpointSliceCache) addEndpointsByIP(serviceNN types.NamespacedName
 			continue
 		}
 
-		isLocal := cache.isLocal(endpoint.Topology[v1.LabelHostname])
+		isLocal := false
+		if endpoint.NodeName != nil {
+			isLocal = cache.isLocal(*endpoint.NodeName)
+		} else {
+			isLocal = cache.isLocal(endpoint.Topology[v1.LabelHostname])
+		}
+
 		endpointInfo := newBaseEndpointInfo(endpoint.Addresses[0], portNum, isLocal, endpoint.Topology)
 
 		// This logic ensures we're deduping potential overlapping endpoints
diff --git a/staging/src/k8s.io/api/discovery/v1alpha1/generated.proto b/staging/src/k8s.io/api/discovery/v1alpha1/generated.proto
index f85ea034b79..4b66a6c57bf 100644
--- a/staging/src/k8s.io/api/discovery/v1alpha1/generated.proto
+++ b/staging/src/k8s.io/api/discovery/v1alpha1/generated.proto
@@ -67,12 +67,13 @@ message Endpoint {
   //   endpoint is located. This should match the corresponding node label.
   // * topology.kubernetes.io/region: the value indicates the region where the
   //   endpoint is located. This should match the corresponding node label.
-  // This field will be deprecated in an upcoming release.
+  // This field is deprecated and will be removed in future api versions.
   // +optional
   map<string, string> topology = 5;
 
   // nodeName represents the name of the Node hosting this endpoint. This can
-  // be used to determine endpoints local to a Node.
+  // be used to determine endpoints local to a Node. This field can be enabled
+  // with the EndpointSliceNodeName feature gate.
   // +optional
   optional string nodeName = 6;
 }
@@ -87,15 +88,18 @@ message EndpointConditions {
   // +optional
   optional bool ready = 1;
 
-  // serving is identical to ready except that it is set regardless of the terminating
-  // state of endpoints. This condition should be set to true for a ready endpoint that
-  // is terminating. If nil, consumers should defer to the ready condition.
+  // serving is identical to ready except that it is set regardless of the
+  // terminating state of endpoints. This condition should be set to true for
+  // a ready endpoint that is terminating. If nil, consumers should defer to
+  // the ready condition. This field can be enabled with the
+  // EndpointSliceTerminatingCondition feature gate.
   // +optional
   optional bool serving = 2;
 
-  // terminating indicates that this endpoint is terminating. A nil value indicates an
-  // unknown state. Consumers should interpret this unknown state to mean that the
-  // endpoint is not terminating.
+  // terminating indicates that this endpoint is terminating. A nil value
+  // indicates an unknown state. Consumers should interpret this unknown state
+  // to mean that the endpoint is not terminating. This field can be enabled
+  // with the EndpointSliceTerminatingCondition feature gate.
   // +optional
   optional bool terminating = 3;
 }
diff --git a/staging/src/k8s.io/api/discovery/v1alpha1/types.go b/staging/src/k8s.io/api/discovery/v1alpha1/types.go
index ca1dca3cc16..34b706ea897 100644
--- a/staging/src/k8s.io/api/discovery/v1alpha1/types.go
+++ b/staging/src/k8s.io/api/discovery/v1alpha1/types.go
@@ -106,11 +106,12 @@ type Endpoint struct {
 	//   endpoint is located. This should match the corresponding node label.
 	// * topology.kubernetes.io/region: the value indicates the region where the
 	//   endpoint is located. This should match the corresponding node label.
-	// This field will be deprecated in an upcoming release.
+	// This field is deprecated and will be removed in future api versions.
 	// +optional
 	Topology map[string]string `json:"topology,omitempty" protobuf:"bytes,5,opt,name=topology"`
 	// nodeName represents the name of the Node hosting this endpoint. This can
-	// be used to determine endpoints local to a Node.
+	// be used to determine endpoints local to a Node. This field can be enabled
+	// with the EndpointSliceNodeName feature gate.
 	// +optional
 	NodeName *string `json:"nodeName,omitempty" protobuf:"bytes,6,opt,name=nodeName"`
 }
@@ -125,15 +126,18 @@ type EndpointConditions struct {
 	// +optional
 	Ready *bool `json:"ready,omitempty" protobuf:"bytes,1,name=ready"`
 
-	// serving is identical to ready except that it is set regardless of the terminating
-	// state of endpoints. This condition should be set to true for a ready endpoint that
-	// is terminating. If nil, consumers should defer to the ready condition.
+	// serving is identical to ready except that it is set regardless of the
+	// terminating state of endpoints. This condition should be set to true for
+	// a ready endpoint that is terminating. If nil, consumers should defer to
+	// the ready condition. This field can be enabled with the
+	// EndpointSliceTerminatingCondition feature gate.
 	// +optional
 	Serving *bool `json:"serving,omitempty" protobuf:"bytes,2,name=serving"`
 
-	// terminating indicates that this endpoint is terminating. A nil value indicates an
-	// unknown state. Consumers should interpret this unknown state to mean that the
-	// endpoint is not terminating.
+	// terminating indicates that this endpoint is terminating. A nil value
+	// indicates an unknown state. Consumers should interpret this unknown state
+	// to mean that the endpoint is not terminating. This field can be enabled
+	// with the EndpointSliceTerminatingCondition feature gate.
 	// +optional
 	Terminating *bool `json:"terminating,omitempty" protobuf:"bytes,3,name=terminating"`
 }
diff --git a/staging/src/k8s.io/api/discovery/v1alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/discovery/v1alpha1/types_swagger_doc_generated.go
index 8012d36a2c1..f6c983689a1 100644
--- a/staging/src/k8s.io/api/discovery/v1alpha1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/discovery/v1alpha1/types_swagger_doc_generated.go
@@ -33,8 +33,8 @@ var map_Endpoint = map[string]string{
 	"conditions": "conditions contains information about the current status of the endpoint.",
 	"hostname":   "hostname of this endpoint. This field may be used by consumers of endpoints to distinguish endpoints from each other (e.g. in DNS names). Multiple endpoints which use the same hostname should be considered fungible (e.g. multiple A values in DNS). Must be lowercase and pass DNS label (RFC 1123) validation.",
 	"targetRef":  "targetRef is a reference to a Kubernetes object that represents this endpoint.",
-	"topology":   "topology contains arbitrary topology information associated with the endpoint. These key/value pairs must conform with the label format. https://kubernetes.io/docs/concepts/overview/working-with-objects/labels Topology may include a maximum of 16 key/value pairs. This includes, but is not limited to the following well known keys: * kubernetes.io/hostname: the value indicates the hostname of the node\n  where the endpoint is located. This should match the corresponding\n  node label.\n* topology.kubernetes.io/zone: the value indicates the zone where the\n  endpoint is located. This should match the corresponding node label.\n* topology.kubernetes.io/region: the value indicates the region where the\n  endpoint is located. This should match the corresponding node label.\nThis field will be deprecated in an upcoming release.",
-	"nodeName":   "nodeName represents the name of the Node hosting this endpoint. This can be used to determine endpoints local to a Node.",
+	"topology":   "topology contains arbitrary topology information associated with the endpoint. These key/value pairs must conform with the label format. https://kubernetes.io/docs/concepts/overview/working-with-objects/labels Topology may include a maximum of 16 key/value pairs. This includes, but is not limited to the following well known keys: * kubernetes.io/hostname: the value indicates the hostname of the node\n  where the endpoint is located. This should match the corresponding\n  node label.\n* topology.kubernetes.io/zone: the value indicates the zone where the\n  endpoint is located. This should match the corresponding node label.\n* topology.kubernetes.io/region: the value indicates the region where the\n  endpoint is located. This should match the corresponding node label.\nThis field is deprecated and will be removed in future api versions.",
+	"nodeName":   "nodeName represents the name of the Node hosting this endpoint. This can be used to determine endpoints local to a Node. This field can be enabled with the EndpointSliceNodeName feature gate.",
 }
 
 func (Endpoint) SwaggerDoc() map[string]string {
@@ -44,8 +44,8 @@ func (Endpoint) SwaggerDoc() map[string]string {
 var map_EndpointConditions = map[string]string{
 	"":            "EndpointConditions represents the current condition of an endpoint.",
 	"ready":       "ready indicates that this endpoint is prepared to receive traffic, according to whatever system is managing the endpoint. A nil value indicates an unknown state. In most cases consumers should interpret this unknown state as ready. For compatibility reasons, ready should never be \"true\" for terminating endpoints.",
-	"serving":     "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
-	"terminating": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating.",
+	"serving":     "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.",
+	"terminating": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.",
 }
 
 func (EndpointConditions) SwaggerDoc() map[string]string {
diff --git a/staging/src/k8s.io/api/discovery/v1beta1/generated.proto b/staging/src/k8s.io/api/discovery/v1beta1/generated.proto
index 6c67870248a..e5d21caadf2 100644
--- a/staging/src/k8s.io/api/discovery/v1beta1/generated.proto
+++ b/staging/src/k8s.io/api/discovery/v1beta1/generated.proto
@@ -67,12 +67,13 @@ message Endpoint {
   //   endpoint is located. This should match the corresponding node label.
   // * topology.kubernetes.io/region: the value indicates the region where the
   //   endpoint is located. This should match the corresponding node label.
-  // this field will be deprecated in an upcoming release.
+  // This field is deprecated and will be removed in future api versions.
   // +optional
   map<string, string> topology = 5;
 
   // nodeName represents the name of the Node hosting this endpoint. This can
-  // be used to determine endpoints local to a Node.
+  // be used to determine endpoints local to a Node. This field can be enabled
+  // with the EndpointSliceNodeName feature gate.
   // +optional
   optional string nodeName = 6;
 }
@@ -87,15 +88,18 @@ message EndpointConditions {
   // +optional
   optional bool ready = 1;
 
-  // serving is identical to ready except that it is set regardless of the terminating
-  // state of endpoints. This condition should be set to true for a ready endpoint that
-  // is terminating. If nil, consumers should defer to the ready condition.
+  // serving is identical to ready except that it is set regardless of the
+  // terminating state of endpoints. This condition should be set to true for
+  // a ready endpoint that is terminating. If nil, consumers should defer to
+  // the ready condition. This field can be enabled with the
+  // EndpointSliceTerminatingCondition feature gate.
   // +optional
   optional bool serving = 2;
 
-  // terminating indicates that this endpoint is terminating. A nil value indicates an
-  // unknown state. Consumers should interpret this unknown state to mean that the
-  // endpoint is not terminating.
+  // terminating indicates that this endpoint is terminating. A nil value
+  // indicates an unknown state. Consumers should interpret this unknown state
+  // to mean that the endpoint is not terminating. This field can be enabled
+  // with the EndpointSliceTerminatingCondition feature gate.
   // +optional
   optional bool terminating = 3;
 }
diff --git a/staging/src/k8s.io/api/discovery/v1beta1/types.go b/staging/src/k8s.io/api/discovery/v1beta1/types.go
index 56b41a5ec43..e14088e8b2c 100644
--- a/staging/src/k8s.io/api/discovery/v1beta1/types.go
+++ b/staging/src/k8s.io/api/discovery/v1beta1/types.go
@@ -102,11 +102,12 @@ type Endpoint struct {
 	//   endpoint is located. This should match the corresponding node label.
 	// * topology.kubernetes.io/region: the value indicates the region where the
 	//   endpoint is located. This should match the corresponding node label.
-	// this field will be deprecated in an upcoming release.
+	// This field is deprecated and will be removed in future api versions.
 	// +optional
 	Topology map[string]string `json:"topology,omitempty" protobuf:"bytes,5,opt,name=topology"`
 	// nodeName represents the name of the Node hosting this endpoint. This can
-	// be used to determine endpoints local to a Node.
+	// be used to determine endpoints local to a Node. This field can be enabled
+	// with the EndpointSliceNodeName feature gate.
 	// +optional
 	NodeName *string `json:"nodeName,omitempty" protobuf:"bytes,6,opt,name=nodeName"`
 }
@@ -121,15 +122,18 @@ type EndpointConditions struct {
 	// +optional
 	Ready *bool `json:"ready,omitempty" protobuf:"bytes,1,name=ready"`
 
-	// serving is identical to ready except that it is set regardless of the terminating
-	// state of endpoints. This condition should be set to true for a ready endpoint that
-	// is terminating. If nil, consumers should defer to the ready condition.
+	// serving is identical to ready except that it is set regardless of the
+	// terminating state of endpoints. This condition should be set to true for
+	// a ready endpoint that is terminating. If nil, consumers should defer to
+	// the ready condition. This field can be enabled with the
+	// EndpointSliceTerminatingCondition feature gate.
 	// +optional
 	Serving *bool `json:"serving,omitempty" protobuf:"bytes,2,name=serving"`
 
-	// terminating indicates that this endpoint is terminating. A nil value indicates an
-	// unknown state. Consumers should interpret this unknown state to mean that the
-	// endpoint is not terminating.
+	// terminating indicates that this endpoint is terminating. A nil value
+	// indicates an unknown state. Consumers should interpret this unknown state
+	// to mean that the endpoint is not terminating. This field can be enabled
+	// with the EndpointSliceTerminatingCondition feature gate.
 	// +optional
 	Terminating *bool `json:"terminating,omitempty" protobuf:"bytes,3,name=terminating"`
 }
diff --git a/staging/src/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go
index 1f7034bda58..d48b93d8b50 100644
--- a/staging/src/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go
@@ -33,8 +33,8 @@ var map_Endpoint = map[string]string{
 	"conditions": "conditions contains information about the current status of the endpoint.",
 	"hostname":   "hostname of this endpoint. This field may be used by consumers of endpoints to distinguish endpoints from each other (e.g. in DNS names). Multiple endpoints which use the same hostname should be considered fungible (e.g. multiple A values in DNS). Must be lowercase and pass DNS Label (RFC 1123) validation.",
 	"targetRef":  "targetRef is a reference to a Kubernetes object that represents this endpoint.",
-	"topology":   "topology contains arbitrary topology information associated with the endpoint. These key/value pairs must conform with the label format. https://kubernetes.io/docs/concepts/overview/working-with-objects/labels Topology may include a maximum of 16 key/value pairs. This includes, but is not limited to the following well known keys: * kubernetes.io/hostname: the value indicates the hostname of the node\n  where the endpoint is located. This should match the corresponding\n  node label.\n* topology.kubernetes.io/zone: the value indicates the zone where the\n  endpoint is located. This should match the corresponding node label.\n* topology.kubernetes.io/region: the value indicates the region where the\n  endpoint is located. This should match the corresponding node label.\nthis field will be deprecated in an upcoming release.",
-	"nodeName":   "nodeName represents the name of the Node hosting this endpoint. This can be used to determine endpoints local to a Node.",
+	"topology":   "topology contains arbitrary topology information associated with the endpoint. These key/value pairs must conform with the label format. https://kubernetes.io/docs/concepts/overview/working-with-objects/labels Topology may include a maximum of 16 key/value pairs. This includes, but is not limited to the following well known keys: * kubernetes.io/hostname: the value indicates the hostname of the node\n  where the endpoint is located. This should match the corresponding\n  node label.\n* topology.kubernetes.io/zone: the value indicates the zone where the\n  endpoint is located. This should match the corresponding node label.\n* topology.kubernetes.io/region: the value indicates the region where the\n  endpoint is located. This should match the corresponding node label.\nThis field is deprecated and will be removed in future api versions.",
+	"nodeName":   "nodeName represents the name of the Node hosting this endpoint. This can be used to determine endpoints local to a Node. This field can be enabled with the EndpointSliceNodeName feature gate.",
 }
 
 func (Endpoint) SwaggerDoc() map[string]string {
@@ -44,8 +44,8 @@ func (Endpoint) SwaggerDoc() map[string]string {
 var map_EndpointConditions = map[string]string{
 	"":            "EndpointConditions represents the current condition of an endpoint.",
 	"ready":       "ready indicates that this endpoint is prepared to receive traffic, according to whatever system is managing the endpoint. A nil value indicates an unknown state. In most cases consumers should interpret this unknown state as ready. For compatibility reasons, ready should never be \"true\" for terminating endpoints.",
-	"serving":     "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.",
-	"terminating": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating.",
+	"serving":     "serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.",
+	"terminating": "terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.",
 }
 
 func (EndpointConditions) SwaggerDoc() map[string]string {