From 0a6dc830da155ed39723fee3db1530b8b724948b Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 29 Jul 2020 10:33:21 +1200 Subject: [PATCH] Fix label reference in deployment checks --- test/e2e/apps/deployment.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/e2e/apps/deployment.go b/test/e2e/apps/deployment.go index 0093a6d788a..bc287e783f4 100644 --- a/test/e2e/apps/deployment.go +++ b/test/e2e/apps/deployment.go @@ -200,7 +200,7 @@ var _ = SIGDescribe("Deployment", func() { case watch.Added: if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" return found, nil } default: @@ -216,10 +216,10 @@ var _ = SIGDescribe("Deployment", func() { _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" && + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" && deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas if !found { - framework.Logf("observed Deployment %v in namespace %v with ReadyReplicas %v", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas) + framework.Logf("observed Deployment %v in namespace %v with ReadyReplicas %v and labels %v", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas, deployment.ObjectMeta.Labels) } return found, nil } @@ -255,7 +255,7 @@ var _ = SIGDescribe("Deployment", func() { case watch.Modified: if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" if !found { framework.Logf("observed Deployment %v in namespace %v with ReadyReplicas %v", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas) } @@ -274,7 +274,7 @@ var _ = SIGDescribe("Deployment", func() { _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" && + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" && deployment.Status.ReadyReplicas == testDeploymentMinimumReplicas && deployment.Spec.Template.Spec.Containers[0].Image == testDeploymentPatchImage if !found { @@ -321,7 +321,7 @@ var _ = SIGDescribe("Deployment", func() { case watch.Modified: if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" if !found { framework.Logf("observed Deployment %v in namespace %v with ReadyReplicas %v", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas) } @@ -348,10 +348,10 @@ var _ = SIGDescribe("Deployment", func() { _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" && + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" && deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas if !found { - framework.Logf("observed Deployment %v in namespace %v with ReadyReplicas %v", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas) + framework.Logf("observed Deployment %v in namespace %v with ReadyReplicas %v and labels %v", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas, deployment.ObjectMeta.Labels) } return found, nil } @@ -377,7 +377,7 @@ var _ = SIGDescribe("Deployment", func() { case watch.Modified: if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" return found, nil } default: @@ -400,7 +400,7 @@ var _ = SIGDescribe("Deployment", func() { _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" && + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" && deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas && deployment.Spec.Template.Spec.Containers[0].Image == testDeploymentUpdateImage if !found { @@ -423,7 +423,7 @@ var _ = SIGDescribe("Deployment", func() { case watch.Deleted: if deployment, ok := event.Object.(*appsv1.Deployment); ok { found := deployment.ObjectMeta.Name == testDeployment.Name && - deployment.Labels["test-deployment-static"] == "true" + deployment.ObjectMeta.Labels["test-deployment-static"] == "true" if !found { framework.Logf("observed Deployment %v in namespace %v with ReadyReplicas %v", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas) }