Support for both map-based and set-based selectors in extensions/v1beta1.Scale

Here are a list of changes along with an explanation of how they work: 1. Add a new string field called TargetSelector to the external version of extensions Scale type (extensions/v1beta1.Scale). This is a serialized version of either the map-based selector (in case of ReplicationControllers) or the unversioned.LabelSelector struct (in case of Deployments and ReplicaSets). 2. Change the selector field in the internal Scale type (extensions.Scale) to unversioned.LabelSelector. 3. Add conversion functions to convert from two external selector fields to a single internal selector field. The rules for conversion are as follows: i. If the target resource that this scale targets supports LabelSelector (Deployments and ReplicaSets), then serialize the LabelSelector and store the string in the TargetSelector field in the external version and leave the map-based Selector field as nil. ii. If the target resource only supports a map-based selector (ReplicationControllers), then still serialize that selector and store the serialized string in the TargetSelector field. Also, set the the Selector map field in the external Scale type. iii. When converting from external to internal version, parse the TargetSelector string into LabelSelector struct if the string isn't empty. If it is empty, then check if the Selector map is set and just assign that map to the MatchLabels component of the LabelSelector. iv. When converting from internal to external version, serialize the LabelSelector and store it in the TargetSelector field. If only the MatchLabel component is set, then also copy that value to the Selector map field in the external version. 4. HPA now just converts the LabelSelector field to a Selector interface type to list the pods. 5. Scale Get and Update etcd methods for Deployments and ReplicaSets now return extensions.Scale instead of autoscaling.Scale. 6. Consequently, SubresourceGroupVersion override and is "autoscaling" enabled check is now removed from pkg/master/master.go 7. Other small changes to labels package, fuzzer and LabelSelector helpers to piece this all together. 8. Add unit tests to HPA targeting Deployments and ReplicaSets. 9. Add an e2e test to HPA targeting ReplicaSets.
2026-01-05 07:27:21 +00:00 · 2016-03-08 16:27:13 -08:00
parent bf3cc9d126
commit fe26381c90
29 changed files with 670 additions and 439 deletions
--- a/pkg/controller/podautoscaler/horizontal_test.go
+++ b/pkg/controller/podautoscaler/horizontal_test.go
@@ -25,6 +25,7 @@ import (

 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	_ "k8s.io/kubernetes/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
@@ -56,6 +57,12 @@ type fakeResponseWrapper struct {
 	raw []byte
 }

+type fakeResource struct {
+	name       string
+	apiVersion string
+	kind       string
+}
+
 type testCase struct {
 	minReplicas     int
 	maxReplicas     int
@@ -74,6 +81,9 @@ type testCase struct {
 	verifyEvents        bool
 	// Channel with names of HPA objects which we have reconciled.
 	processed chan string
+
+	// Target resource information.
+	resource *fakeResource
 }

 func (tc *testCase) computeCPUCurrent() {
@@ -94,8 +104,10 @@ func (tc *testCase) computeCPUCurrent() {
 func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
 	namespace := "test-namespace"
 	hpaName := "test-hpa"
-	rcName := "test-rc"
 	podNamePrefix := "test-pod"
+	selector := &unversioned.LabelSelector{
+		MatchLabels: map[string]string{"name": podNamePrefix},
+	}

 	tc.scaleUpdated = false
 	tc.statusUpdated = false
@@ -103,6 +115,16 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
 	tc.processed = make(chan string, 100)
 	tc.computeCPUCurrent()

+	// TODO(madhusudancs): HPA only supports resources in extensions/v1beta1 right now. Add
+	// tests for "v1" replicationcontrollers when HPA adds support for cross-group scale.
+	if tc.resource == nil {
+		tc.resource = &fakeResource{
+			name:       "test-rc",
+			apiVersion: "extensions/v1beta1",
+			kind:       "replicationcontrollers",
+		}
+	}
+
 	fakeClient := &fake.Clientset{}
 	fakeClient.AddReactor("list", "horizontalpodautoscalers", func(action core.Action) (handled bool, ret runtime.Object, err error) {
 		obj := &extensions.HorizontalPodAutoscalerList{
@@ -115,8 +137,9 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
 					},
 					Spec: extensions.HorizontalPodAutoscalerSpec{
 						ScaleRef: extensions.SubresourceReference{
-							Kind:        "replicationController",
-							Name:        rcName,
+							Kind:        tc.resource.kind,
+							Name:        tc.resource.name,
+							APIVersion:  tc.resource.apiVersion,
 							Subresource: "scale",
 						},
 						MinReplicas: &tc.minReplicas,
@@ -143,10 +166,10 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
 		return true, obj, nil
 	})

-	fakeClient.AddReactor("get", "replicationController", func(action core.Action) (handled bool, ret runtime.Object, err error) {
+	fakeClient.AddReactor("get", "replicationcontrollers", func(action core.Action) (handled bool, ret runtime.Object, err error) {
 		obj := &extensions.Scale{
 			ObjectMeta: api.ObjectMeta{
-				Name:      rcName,
+				Name:      tc.resource.name,
 				Namespace: namespace,
 			},
 			Spec: extensions.ScaleSpec{
@@ -154,7 +177,41 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
 			},
 			Status: extensions.ScaleStatus{
 				Replicas: tc.initialReplicas,
-				Selector: map[string]string{"name": podNamePrefix},
+				Selector: selector,
+			},
+		}
+		return true, obj, nil
+	})
+
+	fakeClient.AddReactor("get", "deployments", func(action core.Action) (handled bool, ret runtime.Object, err error) {
+		obj := &extensions.Scale{
+			ObjectMeta: api.ObjectMeta{
+				Name:      tc.resource.name,
+				Namespace: namespace,
+			},
+			Spec: extensions.ScaleSpec{
+				Replicas: tc.initialReplicas,
+			},
+			Status: extensions.ScaleStatus{
+				Replicas: tc.initialReplicas,
+				Selector: selector,
+			},
+		}
+		return true, obj, nil
+	})
+
+	fakeClient.AddReactor("get", "replicasets", func(action core.Action) (handled bool, ret runtime.Object, err error) {
+		obj := &extensions.Scale{
+			ObjectMeta: api.ObjectMeta{
+				Name:      tc.resource.name,
+				Namespace: namespace,
+			},
+			Spec: extensions.ScaleSpec{
+				Replicas: tc.initialReplicas,
+			},
+			Status: extensions.ScaleStatus{
+				Replicas: tc.initialReplicas,
+				Selector: selector,
 			},
 		}
 		return true, obj, nil
@@ -206,7 +263,23 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
 		return true, newFakeResponseWrapper(heapsterRawMemResponse), nil
 	})

-	fakeClient.AddReactor("update", "replicationController", func(action core.Action) (handled bool, ret runtime.Object, err error) {
+	fakeClient.AddReactor("update", "replicationcontrollers", func(action core.Action) (handled bool, ret runtime.Object, err error) {
+		obj := action.(testclient.UpdateAction).GetObject().(*extensions.Scale)
+		replicas := action.(testclient.UpdateAction).GetObject().(*extensions.Scale).Spec.Replicas
+		assert.Equal(t, tc.desiredReplicas, replicas)
+		tc.scaleUpdated = true
+		return true, obj, nil
+	})
+
+	fakeClient.AddReactor("update", "deployments", func(action core.Action) (handled bool, ret runtime.Object, err error) {
+		obj := action.(testclient.UpdateAction).GetObject().(*extensions.Scale)
+		replicas := action.(testclient.UpdateAction).GetObject().(*extensions.Scale).Spec.Replicas
+		assert.Equal(t, tc.desiredReplicas, replicas)
+		tc.scaleUpdated = true
+		return true, obj, nil
+	})
+
+	fakeClient.AddReactor("update", "replicasets", func(action core.Action) (handled bool, ret runtime.Object, err error) {
 		obj := action.(testclient.UpdateAction).GetObject().(*extensions.Scale)
 		replicas := action.(testclient.UpdateAction).GetObject().(*extensions.Scale).Spec.Replicas
 		assert.Equal(t, tc.desiredReplicas, replicas)
@@ -269,7 +342,7 @@ func (tc *testCase) runTest(t *testing.T) {
 	tc.verifyResults(t)
 }

-func TestDefaultScaleUp(t *testing.T) {
+func TestDefaultScaleUpRC(t *testing.T) {
 	tc := testCase{
 		minReplicas:         2,
 		maxReplicas:         6,
@@ -282,6 +355,42 @@ func TestDefaultScaleUp(t *testing.T) {
 	tc.runTest(t)
 }

+func TestDefaultScaleUpDeployment(t *testing.T) {
+	tc := testCase{
+		minReplicas:         2,
+		maxReplicas:         6,
+		initialReplicas:     4,
+		desiredReplicas:     5,
+		verifyCPUCurrent:    true,
+		reportedLevels:      []uint64{900, 950, 950, 1000},
+		reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
+		resource: &fakeResource{
+			name:       "test-dep",
+			apiVersion: "extensions/v1beta1",
+			kind:       "deployments",
+		},
+	}
+	tc.runTest(t)
+}
+
+func TestDefaultScaleUpReplicaSet(t *testing.T) {
+	tc := testCase{
+		minReplicas:         2,
+		maxReplicas:         6,
+		initialReplicas:     4,
+		desiredReplicas:     5,
+		verifyCPUCurrent:    true,
+		reportedLevels:      []uint64{900, 950, 950, 1000},
+		reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
+		resource: &fakeResource{
+			name:       "test-replicaset",
+			apiVersion: "extensions/v1beta1",
+			kind:       "replicasets",
+		},
+	}
+	tc.runTest(t)
+}
+
 func TestScaleUp(t *testing.T) {
 	tc := testCase{
 		minReplicas:         2,
@@ -296,6 +405,44 @@ func TestScaleUp(t *testing.T) {
 	tc.runTest(t)
 }

+func TestScaleUpDeployment(t *testing.T) {
+	tc := testCase{
+		minReplicas:         2,
+		maxReplicas:         6,
+		initialReplicas:     3,
+		desiredReplicas:     5,
+		CPUTarget:           30,
+		verifyCPUCurrent:    true,
+		reportedLevels:      []uint64{300, 500, 700},
+		reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
+		resource: &fakeResource{
+			name:       "test-dep",
+			apiVersion: "extensions/v1beta1",
+			kind:       "deployments",
+		},
+	}
+	tc.runTest(t)
+}
+
+func TestScaleUpReplicaSet(t *testing.T) {
+	tc := testCase{
+		minReplicas:         2,
+		maxReplicas:         6,
+		initialReplicas:     3,
+		desiredReplicas:     5,
+		CPUTarget:           30,
+		verifyCPUCurrent:    true,
+		reportedLevels:      []uint64{300, 500, 700},
+		reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")},
+		resource: &fakeResource{
+			name:       "test-replicaset",
+			apiVersion: "extensions/v1beta1",
+			kind:       "replicasets",
+		},
+	}
+	tc.runTest(t)
+}
+
 func TestScaleUpCM(t *testing.T) {
 	tc := testCase{
 		minReplicas:     2,