mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Remove e2e test for creating a new deployment
This commit is contained in:
parent
1ced5ae22c
commit
282c90bc1a
@ -63,9 +63,6 @@ var _ = framework.KubeDescribe("Deployment", func() {
|
|||||||
// TODO: Add failure traps once we have JustAfterEach
|
// TODO: Add failure traps once we have JustAfterEach
|
||||||
// See https://github.com/onsi/ginkgo/issues/303
|
// See https://github.com/onsi/ginkgo/issues/303
|
||||||
|
|
||||||
It("deployment should create new pods", func() {
|
|
||||||
testNewDeployment(f)
|
|
||||||
})
|
|
||||||
It("deployment reaping should cascade to its replica sets and pods", func() {
|
It("deployment reaping should cascade to its replica sets and pods", func() {
|
||||||
testDeleteDeployment(f)
|
testDeleteDeployment(f)
|
||||||
})
|
})
|
||||||
@ -192,37 +189,6 @@ func stopDeployment(c clientset.Interface, internalClient internalclientset.Inte
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func testNewDeployment(f *framework.Framework) {
|
|
||||||
ns := f.Namespace.Name
|
|
||||||
c := f.ClientSet
|
|
||||||
|
|
||||||
deploymentName := "test-new-deployment"
|
|
||||||
podLabels := map[string]string{"name": nginxImageName}
|
|
||||||
replicas := int32(1)
|
|
||||||
framework.Logf("Creating simple deployment %s", deploymentName)
|
|
||||||
d := framework.NewDeployment(deploymentName, replicas, podLabels, nginxImageName, nginxImage, extensions.RollingUpdateDeploymentStrategyType)
|
|
||||||
d.Annotations = map[string]string{"test": "should-copy-to-replica-set", v1.LastAppliedConfigAnnotation: "should-not-copy-to-replica-set"}
|
|
||||||
deploy, err := c.Extensions().Deployments(ns).Create(d)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
|
|
||||||
// Wait for it to be updated to revision 1
|
|
||||||
err = framework.WaitForDeploymentRevisionAndImage(c, ns, deploymentName, "1", nginxImage)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
|
|
||||||
err = framework.WaitForDeploymentStatusValid(c, deploy)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
|
|
||||||
deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{})
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
newRS, err := deploymentutil.GetNewReplicaSet(deployment, c)
|
|
||||||
Expect(err).NotTo(HaveOccurred())
|
|
||||||
// Check new RS annotations
|
|
||||||
Expect(newRS.Annotations["test"]).Should(Equal("should-copy-to-replica-set"))
|
|
||||||
Expect(newRS.Annotations[v1.LastAppliedConfigAnnotation]).Should(Equal(""))
|
|
||||||
Expect(deployment.Annotations["test"]).Should(Equal("should-copy-to-replica-set"))
|
|
||||||
Expect(deployment.Annotations[v1.LastAppliedConfigAnnotation]).Should(Equal("should-not-copy-to-replica-set"))
|
|
||||||
}
|
|
||||||
|
|
||||||
func testDeleteDeployment(f *framework.Framework) {
|
func testDeleteDeployment(f *framework.Framework) {
|
||||||
ns := f.Namespace.Name
|
ns := f.Namespace.Name
|
||||||
c := f.ClientSet
|
c := f.ClientSet
|
||||||
|
Loading…
Reference in New Issue
Block a user