Merge pull request #65624 from kubernetes/revert-65179-reduce-service-endpoints-in-load-test

Automatic merge from submit-queue (batch tested with PRs 65518, 65624, 65380, 65390, 65586). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Revert "Make no. of services in load test configurable"

Reverts kubernetes/kubernetes#65179

To verify if that helps with https://github.com/kubernetes/kubernetes/issues/65441

test/e2e/scalability/load.go

@@ -492,17 +492,6 @@ func GenerateConfigsForGroup(
 	secretConfigs := make([]*testutils.SecretConfig, 0, count*secretsPerPod)
 	configMapConfigs := make([]*testutils.ConfigMapConfig, 0, count*configMapsPerPod)
 	savedKind := kind
-
-	// We assume by default that every RC is part of its own service.
-	// However, you can override it using SERVICE_TO_RC_RATIO env var.
-	serviceToRCRatio := 1.0
-	if serviceToRCRatioEnv := os.Getenv("SERVICE_TO_RC_RATIO"); serviceToRCRatioEnv != "" {
-		if value, err := strconv.ParseFloat(serviceToRCRatioEnv, 64); err == nil {
-			serviceToRCRatio = value
-		}
-	}
-	numServices := int(float64(count) * serviceToRCRatio)
-
 	for i := 1; i <= count; i++ {
 		kind = savedKind
 		namespace := nss[i%len(nss)].Name
@@ -546,11 +535,8 @@ func GenerateConfigsForGroup(
 			MemRequest:     26214400, // 25MB
 			SecretNames:    secretNames,
 			ConfigMapNames: configMapNames,
-		}
-
-		// Add a label to first 'numServices' RCs (to include them in services).
-		if i <= numServices {
-			baseConfig.Labels = map[string]string{svcLabelKey: groupName + "-" + strconv.Itoa(i)}
+			// Define a label to group every 2 RCs into one service.
+			Labels: map[string]string{svcLabelKey: groupName + "-" + strconv.Itoa((i+1)/2)},
 		}
 
 		if kind == randomKind {