rename DeploymentPodReplacementPolicy FG to DeploymentReplicaSetTerminatingReplicas

Author: atiratree

CHANGELOG/CHANGELOG-1.33.md

@@ -614,7 +614,7 @@ name | architectures
 
 ### API Change
 
-- A new status field `.status.terminatingReplicas` is added to Deployments and ReplicaSets to allow tracking of terminating pods when the DeploymentPodReplacementPolicy feature-gate is enabled. ([#128546](https://github.com/kubernetes/kubernetes/pull/128546), [@atiratree](https://github.com/atiratree)) [SIG API Machinery, Apps and Testing]
+- A new status field `.status.terminatingReplicas` is added to Deployments and ReplicaSets to allow tracking of terminating pods when the DeploymentReplicaSetTerminatingReplicas feature-gate is enabled. ([#128546](https://github.com/kubernetes/kubernetes/pull/128546), [@atiratree](https://github.com/atiratree)) [SIG API Machinery, Apps and Testing]
 - DRA API: the maximum number of pods which can use the same ResourceClaim is now 256 instead of 32. Beware that downgrading a cluster where this relaxed limit is in use to Kubernetes 1.32.0 is not supported because 1.32.0 would refuse to update ResourceClaims with more than 32 entries in the status.reservedFor field. ([#129543](https://github.com/kubernetes/kubernetes/pull/129543), [@pohly](https://github.com/pohly)) [SIG API Machinery, Node and Testing]
 - DRA: CEL expressions using attribute strings exceeded the cost limit because their cost estimation was incomplete. ([#129661](https://github.com/kubernetes/kubernetes/pull/129661), [@pohly](https://github.com/pohly)) [SIG Node]
 - DRA: when asking for "All" devices on a node, Kubernetes <= 1.32 proceeded to schedule pods onto nodes with no devices by not allocating any devices for those pods. Kubernetes 1.33 changes that to only picking nodes which have at least one device. Users who want the "proceed with scheduling also without devices" semantic can use the upcoming prioritized list feature with one sub-request for "all" devices and a second alternative with "count: 0". ([#129560](https://github.com/kubernetes/kubernetes/pull/129560), [@bart0sh](https://github.com/bart0sh)) [SIG API Machinery and Node]

api/openapi-spec/swagger.json

@@ -533,7 +533,7 @@ type DeploymentStatus struct {
 	// Total number of terminating pods targeted by this deployment. Terminating pods have a non-null
 	// .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.
 	//
-	// This is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.
+	// This is an alpha field. Enable DeploymentReplicaSetTerminatingReplicas to be able to use this field.
 	// +optional
 	TerminatingReplicas *int32
 
@@ -892,7 +892,7 @@ type ReplicaSetStatus struct {
 	// The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp
 	// and have not yet reached the Failed or Succeeded .status.phase.
 	//
-	// This is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.
+	// This is an alpha field. Enable DeploymentReplicaSetTerminatingReplicas to be able to use this field.
 	// +optional
 	TerminatingReplicas *int32
 

api/openapi-spec/v3/apis__apps__v1_openapi.json

@@ -506,7 +506,7 @@ func calculateStatus(allRSs []*apps.ReplicaSet, newRS *apps.ReplicaSet, deployme
 		UnavailableReplicas: unavailableReplicas,
 		CollisionCount:      deployment.Status.CollisionCount,
 	}
-	if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentPodReplacementPolicy) {
+	if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentReplicaSetTerminatingReplicas) {
 		status.TerminatingReplicas = deploymentutil.GetTerminatingReplicaCountForReplicaSets(allRSs)
 	}
 

pkg/apis/apps/types.go

@@ -1455,14 +1455,14 @@ func TestMinAvailable(t *testing.T) {
 
 func TestGetReplicaSetFraction(t *testing.T) {
 	tests := []struct {
-		name                                 string
-		enableDeploymentPodReplacementPolicy bool
-		deploymentReplicas                   int32
-		deploymentStatusReplicas             int32
-		deploymentMaxSurge                   int32
-		rsReplicas                           int32
-		rsAnnotations                        map[string]string
-		expectedFraction                     int32
+		name                                          string
+		enableDeploymentReplicaSetTerminatingReplicas bool
+		deploymentReplicas                            int32
+		deploymentStatusReplicas                      int32
+		deploymentMaxSurge                            int32
+		rsReplicas                                    int32
+		rsAnnotations                                 map[string]string
+		expectedFraction                              int32
 	}{
 		{
 			name:               "empty deployment always scales to 0",

pkg/controller/deployment/sync.go

@@ -719,7 +719,7 @@ func (rsc *ReplicaSetController) syncReplicaSet(ctx context.Context, key string)
 	}
 
 	var terminatingPods []*v1.Pod
-	if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentPodReplacementPolicy) {
+	if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentReplicaSetTerminatingReplicas) {
 		allTerminatingPods := controller.FilterTerminatingPods(allPods)
 		terminatingPods = controller.FilterClaimedPods(rs, selector, allTerminatingPods)
 	}

pkg/controller/deployment/util/deployment_util_test.go

@@ -61,7 +61,7 @@ func updateReplicaSetStatus(logger klog.Logger, c appsclient.ReplicaSetInterface
 	var updatedRS *apps.ReplicaSet
 	for i, rs := 0, rs; ; i++ {
 		terminatingReplicasUpdateInfo := ""
-		if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentPodReplacementPolicy) {
+		if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentReplicaSetTerminatingReplicas) {
 			terminatingReplicasUpdateInfo = fmt.Sprintf("terminatingReplicas %s->%s, ", derefInt32ToStr(rs.Status.TerminatingReplicas), derefInt32ToStr(newStatus.TerminatingReplicas))
 		}
 		logger.V(4).Info(fmt.Sprintf("Updating status for %v: %s/%s, ", rs.Kind, rs.Namespace, rs.Name) +
@@ -116,7 +116,7 @@ func calculateStatus(rs *apps.ReplicaSet, activePods []*v1.Pod, terminatingPods
 	}
 
 	var terminatingReplicasCount *int32
-	if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentPodReplacementPolicy) {
+	if utilfeature.DefaultFeatureGate.Enabled(features.DeploymentReplicaSetTerminatingReplicas) {
 		terminatingReplicasCount = ptr.To(int32(len(terminatingPods)))
 	}
 

pkg/controller/replicaset/replica_set.go

@@ -47,12 +47,12 @@ func TestCalculateStatus(t *testing.T) {
 	}
 
 	rsStatusTests := []struct {
-		name                                 string
-		enableDeploymentPodReplacementPolicy bool
-		replicaset                           *apps.ReplicaSet
-		activePods                           []*v1.Pod
-		terminatingPods                      []*v1.Pod
-		expectedReplicaSetStatus             apps.ReplicaSetStatus
+		name                                          string
+		enableDeploymentReplicaSetTerminatingReplicas bool
+		replicaset                                    *apps.ReplicaSet
+		activePods                                    []*v1.Pod
+		terminatingPods                               []*v1.Pod
+		expectedReplicaSetStatus                      apps.ReplicaSetStatus
 	}{
 		{
 			"1 fully labelled pod",
@@ -104,7 +104,7 @@ func TestCalculateStatus(t *testing.T) {
 			},
 		},
 		{
-			"2 fully labelled pods with DeploymentPodReplacementPolicy",
+			"2 fully labelled pods with DeploymentReplicaSetTerminatingReplicas",
 			true,
 			fullyLabelledRS,
 			[]*v1.Pod{
@@ -187,7 +187,7 @@ func TestCalculateStatus(t *testing.T) {
 			},
 		},
 		{
-			"1 fully labelled pod and 1 terminating without DeploymentPodReplacementPolicy",
+			"1 fully labelled pod and 1 terminating without DeploymentReplicaSetTerminatingReplicas",
 			false,
 			fullyLabelledRS,
 			[]*v1.Pod{
@@ -205,7 +205,7 @@ func TestCalculateStatus(t *testing.T) {
 			},
 		},
 		{
-			"1 fully labelled pods and 2 terminating with DeploymentPodReplacementPolicy",
+			"1 fully labelled pods and 2 terminating with DeploymentReplicaSetTerminatingReplicas",
 			true,
 			fullyLabelledRS,
 			[]*v1.Pod{
@@ -227,7 +227,7 @@ func TestCalculateStatus(t *testing.T) {
 
 	for _, test := range rsStatusTests {
 		t.Run(test.name, func(t *testing.T) {
-			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.DeploymentPodReplacementPolicy, test.enableDeploymentPodReplacementPolicy)
+			featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.DeploymentReplicaSetTerminatingReplicas, test.enableDeploymentReplicaSetTerminatingReplicas)
 
 			replicaSetStatus := calculateStatus(test.replicaset, test.activePods, test.terminatingPods, nil)
 			if !reflect.DeepEqual(replicaSetStatus, test.expectedReplicaSetStatus) {

pkg/controller/replicaset/replica_set_utils.go

@@ -180,7 +180,7 @@ const (
 	// kep: http://kep.k8s.io/3973
 	//
 	// Deployments and replica sets can now also track terminating pods via .status.terminatingReplicas.
-	DeploymentPodReplacementPolicy featuregate.Feature = "DeploymentPodReplacementPolicy"
+	DeploymentReplicaSetTerminatingReplicas featuregate.Feature = "DeploymentReplicaSetTerminatingReplicas"
 
 	// owner: @elezar
 	// kep: http://kep.k8s.io/4009
@@ -1120,7 +1120,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 		{Version: version.MustParse("1.33"), Default: false, PreRelease: featuregate.Beta},
 	},
 
-	DeploymentPodReplacementPolicy: {
+	DeploymentReplicaSetTerminatingReplicas: {
 		{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha},
 	},