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

Update patch checks, scale patch type

Browse Source
This commit is contained in:
Caleb Woodbine 2020-04-20 13:57:09 +12:00
parent a962d80b99
commit 54c744f033
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ 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"
@ -163,8 +162,9 @@ var _ = SIGDescribe("ReplicationController", func() {
framework.ExpectNoError(err, "failed to marshal json of replicationcontroller label patch") framework.ExpectNoError(err, "failed to marshal json of replicationcontroller label patch")
// Patch the ReplicationController // Patch the ReplicationController
ginkgo.By("patching ReplicationController") ginkgo.By("patching ReplicationController")
_, err = f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).Patch(context.TODO(), testRcName, types.StrategicMergePatchType, []byte(rcLabelPatchPayload), metav1.PatchOptions{}) testRcPatched, err := f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).Patch(context.TODO(), testRcName, types.StrategicMergePatchType, []byte(rcLabelPatchPayload), metav1.PatchOptions{})
framework.ExpectNoError(err, "Failed to patch ReplicationController") framework.ExpectNoError(err, "Failed to patch ReplicationController")
framework.ExpectEqual(testRcPatched.ObjectMeta.Labels["test-rc"], "patched", "failed to patch RC")
ginkgo.By("waiting for RC to be modified") ginkgo.By("waiting for RC to be modified")
for watchEvent := range rcWatchChan { for watchEvent := range rcWatchChan {
if watchEvent.Type == watch.Modified { if watchEvent.Type == watch.Modified {
@ -192,6 +192,15 @@ var _ = SIGDescribe("ReplicationController", func() {
} }
} }
for watchEvent := range rcWatchChan {
rc, ok := watchEvent.Object.(*v1.ReplicationController)
framework.ExpectEqual(ok, true, "Unable to convert type of ReplicationController watch watchEvent")
if rc.Status.Replicas == testRcInitialReplicaCount {
break
}
}
ginkgo.By("fetching ReplicationController status") ginkgo.By("fetching ReplicationController status")
rcStatusUnstructured, err := dc.Resource(rcResource).Namespace(testRcNamespace).Get(context.TODO(), testRcName, metav1.GetOptions{}, "status") rcStatusUnstructured, err := dc.Resource(rcResource).Namespace(testRcNamespace).Get(context.TODO(), testRcName, metav1.GetOptions{}, "status")
framework.ExpectNoError(err, "Failed to fetch ReplicationControllerStatus") framework.ExpectNoError(err, "Failed to fetch ReplicationControllerStatus")
@ -201,9 +210,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(autoscalingv1.Scale{ rcScalePatchPayload, err := json.Marshal(v1.ReplicationController{
Spec: autoscalingv1.ScaleSpec{ Spec: v1.ReplicationControllerSpec{
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")