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

Update and improve ReplicationController resource lifecycle test

Browse Source
This commit is contained in:
Caleb Woodbine 2020-04-02 10:53:22 +13:00
parent e8b70ce0da
commit a962d80b99
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
watch "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/controller/replication"
@ -139,6 +140,12 @@ var _ = SIGDescribe("ReplicationController", func() {
rcWatchChan := rcWatch.ResultChan() rcWatchChan := rcWatch.ResultChan()
ginkgo.By("waiting for RC to be added")
for watchEvent := range rcWatchChan {
if watchEvent.Type == watch.Added {
break
}
}
ginkgo.By("waiting for available Replicas") ginkgo.By("waiting for available Replicas")
for watchEvent := range rcWatchChan { for watchEvent := range rcWatchChan {
rc, ok := watchEvent.Object.(*v1.ReplicationController) rc, ok := watchEvent.Object.(*v1.ReplicationController)
@ -158,6 +165,12 @@ var _ = SIGDescribe("ReplicationController", func() {
ginkgo.By("patching ReplicationController") ginkgo.By("patching ReplicationController")
_, err = f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).Patch(context.TODO(), testRcName, types.StrategicMergePatchType, []byte(rcLabelPatchPayload), metav1.PatchOptions{}) _, 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")
ginkgo.By("waiting for RC to be modified")
for watchEvent := range rcWatchChan {
if watchEvent.Type == watch.Modified {
break
}
}
rcStatusPatchPayload, err := json.Marshal(map[string]interface{}{ rcStatusPatchPayload, err := json.Marshal(map[string]interface{}{
"status": map[string]interface{}{ "status": map[string]interface{}{
@ -172,6 +185,12 @@ var _ = SIGDescribe("ReplicationController", func() {
rcStatus, err := f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).Patch(context.TODO(), testRcName, types.StrategicMergePatchType, []byte(rcStatusPatchPayload), metav1.PatchOptions{}, "status") rcStatus, err := f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).Patch(context.TODO(), testRcName, types.StrategicMergePatchType, []byte(rcStatusPatchPayload), metav1.PatchOptions{}, "status")
framework.ExpectNoError(err, "Failed to patch ReplicationControllerStatus") framework.ExpectNoError(err, "Failed to patch ReplicationControllerStatus")
framework.ExpectEqual(rcStatus.Status.ReadyReplicas, int32(0), "ReplicationControllerStatus's readyReplicas does not equal 0") framework.ExpectEqual(rcStatus.Status.ReadyReplicas, int32(0), "ReplicationControllerStatus's readyReplicas does not equal 0")
ginkgo.By("waiting for RC to be modified")
for watchEvent := range rcWatchChan {
if watchEvent.Type == watch.Modified {
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")
@ -193,6 +212,12 @@ var _ = SIGDescribe("ReplicationController", func() {
ginkgo.By("patching ReplicationController scale") ginkgo.By("patching ReplicationController scale")
_, err = f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).Patch(context.TODO(), testRcName, types.StrategicMergePatchType, []byte(rcScalePatchPayload), metav1.PatchOptions{}, "scale") _, err = f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).Patch(context.TODO(), testRcName, types.StrategicMergePatchType, []byte(rcScalePatchPayload), metav1.PatchOptions{}, "scale")
framework.ExpectNoError(err, "Failed to patch ReplicationControllerScale") framework.ExpectNoError(err, "Failed to patch ReplicationControllerScale")
ginkgo.By("waiting for RC to be modified")
for watchEvent := range rcWatchChan {
if watchEvent.Type == watch.Modified {
break
}
}
var rcFromWatch *v1.ReplicationController var rcFromWatch *v1.ReplicationController
ginkgo.By("waiting for ReplicationController's scale to be the max amount") ginkgo.By("waiting for ReplicationController's scale to be the max amount")
@ -224,12 +249,9 @@ var _ = SIGDescribe("ReplicationController", func() {
rcStatus, err = f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).UpdateStatus(context.TODO(), rcStatusUpdatePayload, metav1.UpdateOptions{}) rcStatus, err = f.ClientSet.CoreV1().ReplicationControllers(testRcNamespace).UpdateStatus(context.TODO(), rcStatusUpdatePayload, metav1.UpdateOptions{})
framework.ExpectNoError(err, "failed to update ReplicationControllerStatus") framework.ExpectNoError(err, "failed to update ReplicationControllerStatus")
framework.ExpectEqual(rcStatus.Status.ReadyReplicas, int32(1), "ReplicationControllerStatus readyReplicas does not equal 1") framework.ExpectEqual(rcStatus.Status.ReadyReplicas, int32(1), "ReplicationControllerStatus readyReplicas does not equal 1")
ginkgo.By("waiting for RC to be modified")
ginkgo.By(fmt.Sprintf("waiting for ReplicationController readyReplicas to be equal to %v", testRcMaxReplicaCount))
for watchEvent := range rcWatchChan { for watchEvent := range rcWatchChan {
rc, ok := watchEvent.Object.(*v1.ReplicationController) if watchEvent.Type == watch.Modified {
framework.ExpectEqual(ok, true, "unable to convert type of ReplicationController watch watchEvent")
if rc.Status.Replicas == testRcMaxReplicaCount && rc.Status.ReadyReplicas == testRcMaxReplicaCount {
break break
} }
} }
@ -245,9 +267,7 @@ var _ = SIGDescribe("ReplicationController", func() {
if rcItem.ObjectMeta.Name == testRcName && if rcItem.ObjectMeta.Name == testRcName &&
rcItem.ObjectMeta.Namespace == testRcNamespace && rcItem.ObjectMeta.Namespace == testRcNamespace &&
rcItem.ObjectMeta.Labels["test-rc-static"] == "true" && rcItem.ObjectMeta.Labels["test-rc-static"] == "true" &&
rcItem.ObjectMeta.Labels["test-rc"] == "patched" && rcItem.ObjectMeta.Labels["test-rc"] == "patched" {
rcItem.Status.Replicas == testRcMaxReplicaCount &&
rcItem.Status.ReadyReplicas == testRcMaxReplicaCount {
foundRc = true foundRc = true
} }
} }
@ -260,7 +280,7 @@ var _ = SIGDescribe("ReplicationController", func() {
ginkgo.By("waiting for ReplicationController to have a DELETED watchEvent") ginkgo.By("waiting for ReplicationController to have a DELETED watchEvent")
for watchEvent := range rcWatchChan { for watchEvent := range rcWatchChan {
if watchEvent.Type == "DELETED" { if watchEvent.Type == watch.Deleted {
break break
} }
} }