github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118840 from AhmedGrati/fix-deployment-patch-e2e-test

Browse Source 
fix: update deployment e2e tests
This commit is contained in:
Kubernetes Prow Robot 2023-06-26 04:49:44 -07:00 committed by GitHub
commit a374d893f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,7 @@ var _ = SIGDescribe("Deployment", func() {
testDeploymentDefaultReplicas := int32(2)
testDeploymentMinimumReplicas := int32(1)
testDeploymentNoReplicas := int32(0)
testDeploymentAvailableReplicas := int32(0)
testDeploymentLabels := map[string]string{"test-deployment-static": "true"}
testDeploymentLabelsFlat := "test-deployment-static=true"
w := &cache.ListWatch{
@ -399,14 +400,14 @@ var _ = SIGDescribe("Deployment", func() {
"labels": map[string]string{"test-deployment": "patched-status"},
},
"status": map[string]interface{}{
"readyReplicas": testDeploymentNoReplicas,
"readyReplicas": testDeploymentNoReplicas,
"availableReplicas": testDeploymentAvailableReplicas,
},
})
framework.ExpectNoError(err, "failed to Marshal Deployment JSON patch")
// This test is broken, patching fails with:
// Deployment.apps "test-deployment" is invalid: status.availableReplicas: Invalid value: 2: cannot be greater than readyReplicas
// https://github.com/kubernetes/kubernetes/issues/113259
_, _ = dc.Resource(deploymentResource).Namespace(testNamespaceName).Patch(ctx, testDeploymentName, types.StrategicMergePatchType, []byte(deploymentStatusPatch), metav1.PatchOptions{}, "status")
_, err = dc.Resource(deploymentResource).Namespace(testNamespaceName).Patch(ctx, testDeploymentName, types.StrategicMergePatchType, []byte(deploymentStatusPatch), metav1.PatchOptions{}, "status")
framework.ExpectNoError(err)
ctxUntil, cancel = context.WithTimeout(ctx, 30*time.Second)
defer cancel()