Skip to content

K
k3s
Unverified Commit 13f0abb5 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63674 from kow3ns/release-1.10

Automatic merge from submit-queue. Fix Deployment e2e on master upgrade (62703) **What this PR does / why we need it**: Selector and label mutation for RSs created by Deploys has been deprecated, but the e2e in this version still checks for it. We need to remove these checks in order for master upgrade validation to pass. Fixes #62703 ```release-note NONE ```
parents 1600775c 7ccb990f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
test/e2e/apps/deployment.go
View file @ 13f0abb5
...@@ -274,10 +274,6 @@ func testRollingUpdateDeployment(f *framework.Framework) { ...@@ -274,10 +274,6 @@ func testRollingUpdateDeployment(f *framework.Framework) {
_, allOldRSs, err := deploymentutil.GetOldReplicaSets(deployment, c.ExtensionsV1beta1()) _, allOldRSs, err := deploymentutil.GetOldReplicaSets(deployment, c.ExtensionsV1beta1())
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(len(allOldRSs)).Should(Equal(1)) Expect(len(allOldRSs)).Should(Equal(1))
// The old RS should contain pod-template-hash in its selector, label, and template label
Expect(len(allOldRSs[0].Labels[extensions.DefaultDeploymentUniqueLabelKey])).Should(BeNumerically(">", 0))
Expect(len(allOldRSs[0].Spec.Selector.MatchLabels[extensions.DefaultDeploymentUniqueLabelKey])).Should(BeNumerically(">", 0))
Expect(len(allOldRSs[0].Spec.Template.Labels[extensions.DefaultDeploymentUniqueLabelKey])).Should(BeNumerically(">", 0))
} }
func testRecreateDeployment(f *framework.Framework) { func testRecreateDeployment(f *framework.Framework) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment