From 1c010beb248213ac6a965a808386b59df89c0b70 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 22 Apr 2020 10:01:13 +1200 Subject: [PATCH] Revert scale patch payload types --- test/e2e/apps/BUILD | 1 + test/e2e/apps/rc.go | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/apps/BUILD b/test/e2e/apps/BUILD index 039a5aac3ce..957e001ca62 100644 --- a/test/e2e/apps/BUILD +++ b/test/e2e/apps/BUILD @@ -34,6 +34,7 @@ go_library( "//pkg/master/ports:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", + "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/test/e2e/apps/rc.go b/test/e2e/apps/rc.go index 7a15f956812..afe3de89f0e 100644 --- a/test/e2e/apps/rc.go +++ b/test/e2e/apps/rc.go @@ -22,6 +22,7 @@ import ( "fmt" "time" + autoscalingv1 "k8s.io/api/autoscaling/v1" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" @@ -210,9 +211,9 @@ var _ = SIGDescribe("ReplicationController", func() { json.Unmarshal(rcStatusUjson, &rcStatus) framework.ExpectEqual(rcStatus.Status.Replicas, testRcInitialReplicaCount, "ReplicationController ReplicaSet cound does not match initial Replica count") - rcScalePatchPayload, err := json.Marshal(v1.ReplicationController{ - Spec: v1.ReplicationControllerSpec{ - Replicas: &testRcMaxReplicaCount, + rcScalePatchPayload, err := json.Marshal(autoscalingv1.Scale{ + Spec: autoscalingv1.ScaleSpec{ + Replicas: testRcMaxReplicaCount, }, }) framework.ExpectNoError(err, "Failed to marshal json of replicationcontroller label patch")