github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Revert scale patch payload types

Browse Source
This commit is contained in:
Caleb Woodbine 2020-04-22 10:01:13 +12:00
parent 29c85b7265
commit 1c010beb24
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/apps/BUILD
View File

@ -34,6 +34,7 @@ go_library(
"//pkg/master/ports:go_default_library", "//pkg/master/ports:go_default_library",
"//pkg/scheduler/apis/config: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/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/v1:go_default_library",
"//staging/src/k8s.io/api/batch/v1beta1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",

7
test/e2e/apps/rc.go
View File

@ -22,6 +22,7 @@ import (
"fmt" "fmt"
"time" "time"
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
@ -210,9 +211,9 @@ var _ = SIGDescribe("ReplicationController", func() {
json.Unmarshal(rcStatusUjson, &rcStatus) json.Unmarshal(rcStatusUjson, &rcStatus)
framework.ExpectEqual(rcStatus.Status.Replicas, testRcInitialReplicaCount, "ReplicationController ReplicaSet cound does not match initial Replica count") framework.ExpectEqual(rcStatus.Status.Replicas, testRcInitialReplicaCount, "ReplicationController ReplicaSet cound does not match initial Replica count")
rcScalePatchPayload, err := json.Marshal(v1.ReplicationController{ rcScalePatchPayload, err := json.Marshal(autoscalingv1.Scale{
Spec: v1.ReplicationControllerSpec{ Spec: autoscalingv1.ScaleSpec{
Replicas: &testRcMaxReplicaCount, Replicas: testRcMaxReplicaCount,
}, },
}) })
framework.ExpectNoError(err, "Failed to marshal json of replicationcontroller label patch") framework.ExpectNoError(err, "Failed to marshal json of replicationcontroller label patch")