github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Add check for Modified after patch; Update checks for scale

Browse Source
This commit is contained in:
Caleb Woodbine 2020-07-22 09:57:11 +12:00
parent fc8e24c686
commit 11492f7b91
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/apps/deployment.go
View File

@ -245,6 +245,22 @@ var _ = SIGDescribe("Deployment", func() {
framework.ExpectNoError(err, "failed to Marshal Deployment JSON patch") framework.ExpectNoError(err, "failed to Marshal Deployment JSON patch")
_, err = f.ClientSet.AppsV1().Deployments(testNamespaceName).Patch(context.TODO(), testDeploymentName, types.StrategicMergePatchType, []byte(deploymentPatch), metav1.PatchOptions{}) _, err = f.ClientSet.AppsV1().Deployments(testNamespaceName).Patch(context.TODO(), testDeploymentName, types.StrategicMergePatchType, []byte(deploymentPatch), metav1.PatchOptions{})
framework.ExpectNoError(err, "failed to patch Deployment") framework.ExpectNoError(err, "failed to patch Deployment")
ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
_, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
switch event.Type {
case watch.Modified:
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
found := deployment.ObjectMeta.Name == testDeployment.Name &&
deployment.Labels["test-deployment-static"] == "true"
return found, nil
}
default:
framework.Logf("observed event type %v", event.Type)
}
return false, nil
})
framework.ExpectNoError(err, "failed to see %v event", watch.Modified)
ginkgo.By("waiting for Replicas to scale") ginkgo.By("waiting for Replicas to scale")
ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second) ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
@ -254,7 +270,8 @@ var _ = SIGDescribe("Deployment", func() {
found := deployment.ObjectMeta.Name == testDeployment.Name && found := deployment.ObjectMeta.Name == testDeployment.Name &&
deployment.Labels["test-deployment-static"] == "true" && deployment.Labels["test-deployment-static"] == "true" &&
deployment.Status.AvailableReplicas == testDeploymentMinimumReplicas && deployment.Status.AvailableReplicas == testDeploymentMinimumReplicas &&
deployment.Status.ReadyReplicas == testDeploymentMinimumReplicas deployment.Status.ReadyReplicas == testDeploymentMinimumReplicas &&
deployment.Spec.Template.Spec.Containers[0].Image == testDeploymentPatchImage
return found, nil return found, nil
} }
return false, nil return false, nil
@ -268,16 +285,14 @@ var _ = SIGDescribe("Deployment", func() {
for _, deploymentItem := range deploymentsList.Items { for _, deploymentItem := range deploymentsList.Items {
if deploymentItem.ObjectMeta.Name == testDeploymentName && if deploymentItem.ObjectMeta.Name == testDeploymentName &&
deploymentItem.ObjectMeta.Namespace == testNamespaceName && deploymentItem.ObjectMeta.Namespace == testNamespaceName &&
deploymentItem.ObjectMeta.Labels["test-deployment-static"] == "true" && deploymentItem.ObjectMeta.Labels["test-deployment-static"] == "true" {
*deploymentItem.Spec.Replicas == testDeploymentMinimumReplicas &&
deploymentItem.Spec.Template.Spec.Containers[0].Image == testDeploymentPatchImage {
foundDeployment = true foundDeployment = true
break break
} }
} }
framework.ExpectEqual(foundDeployment, true, "unable to find the Deployment in list", deploymentsList) framework.ExpectEqual(foundDeployment, true, "unable to find the Deployment in list", deploymentsList)
ginkgo.By("updating the DeploymentStatus") ginkgo.By("updating the Deployment")
testDeploymentUpdate := testDeployment testDeploymentUpdate := testDeployment
testDeploymentUpdate.ObjectMeta.Labels["test-deployment"] = "updated" testDeploymentUpdate.ObjectMeta.Labels["test-deployment"] = "updated"
testDeploymentUpdate.Spec.Template.Spec.Containers[0].Image = testDeploymentUpdateImage testDeploymentUpdate.Spec.Template.Spec.Containers[0].Image = testDeploymentUpdateImage