mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Fix label reference in deployment checks
This commit is contained in:
parent
d4540f2b40
commit
0a6dc830da
@ -200,7 +200,7 @@ var _ = SIGDescribe("Deployment", func() {
|
|||||||
case watch.Added:
|
case watch.Added:
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true"
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true"
|
||||||
return found, nil
|
return found, nil
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -216,10 +216,10 @@ var _ = SIGDescribe("Deployment", func() {
|
|||||||
_, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
|
_, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true" &&
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true" &&
|
||||||
deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas
|
deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas
|
||||||
if !found {
|
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
|
return found, nil
|
||||||
}
|
}
|
||||||
@ -255,7 +255,7 @@ var _ = SIGDescribe("Deployment", func() {
|
|||||||
case watch.Modified:
|
case watch.Modified:
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true"
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true"
|
||||||
if !found {
|
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", 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) {
|
_, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true" &&
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true" &&
|
||||||
deployment.Status.ReadyReplicas == testDeploymentMinimumReplicas &&
|
deployment.Status.ReadyReplicas == testDeploymentMinimumReplicas &&
|
||||||
deployment.Spec.Template.Spec.Containers[0].Image == testDeploymentPatchImage
|
deployment.Spec.Template.Spec.Containers[0].Image == testDeploymentPatchImage
|
||||||
if !found {
|
if !found {
|
||||||
@ -321,7 +321,7 @@ var _ = SIGDescribe("Deployment", func() {
|
|||||||
case watch.Modified:
|
case watch.Modified:
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true"
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true"
|
||||||
if !found {
|
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", 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) {
|
_, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true" &&
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true" &&
|
||||||
deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas
|
deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas
|
||||||
if !found {
|
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
|
return found, nil
|
||||||
}
|
}
|
||||||
@ -377,7 +377,7 @@ var _ = SIGDescribe("Deployment", func() {
|
|||||||
case watch.Modified:
|
case watch.Modified:
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true"
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true"
|
||||||
return found, nil
|
return found, nil
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -400,7 +400,7 @@ var _ = SIGDescribe("Deployment", func() {
|
|||||||
_, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
|
_, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) {
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true" &&
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true" &&
|
||||||
deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas &&
|
deployment.Status.ReadyReplicas == testDeploymentDefaultReplicas &&
|
||||||
deployment.Spec.Template.Spec.Containers[0].Image == testDeploymentUpdateImage
|
deployment.Spec.Template.Spec.Containers[0].Image == testDeploymentUpdateImage
|
||||||
if !found {
|
if !found {
|
||||||
@ -423,7 +423,7 @@ var _ = SIGDescribe("Deployment", func() {
|
|||||||
case watch.Deleted:
|
case watch.Deleted:
|
||||||
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
if deployment, ok := event.Object.(*appsv1.Deployment); ok {
|
||||||
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
found := deployment.ObjectMeta.Name == testDeployment.Name &&
|
||||||
deployment.Labels["test-deployment-static"] == "true"
|
deployment.ObjectMeta.Labels["test-deployment-static"] == "true"
|
||||||
if !found {
|
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", deployment.ObjectMeta.Name, deployment.ObjectMeta.Namespace, deployment.Status.ReadyReplicas)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user