github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 00:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22014 from ihmccreery/decouple-node-upgrade

Browse Source 
Decouple node upgrade from master upgrade
This commit is contained in:
Fabio Yeon 2016-02-26 13:03:18 -08:00
commit 3ce28f5e0c
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/cluster_upgrade.go
View File

@ -196,10 +196,6 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() {
}) })
Describe("kube-push", func() { Describe("kube-push", func() {
BeforeEach(func() {
SkipUnlessProviderIs("gce")
})
It("of master should maintain responsive services", func() { It("of master should maintain responsive services", func() {
By("Validating cluster before master upgrade") By("Validating cluster before master upgrade")
expectNoError(validate(f, svcName, rcName, ingress, replicas)) expectNoError(validate(f, svcName, rcName, ingress, replicas))
@ -211,10 +207,6 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() {
}) })
Describe("upgrade-master", func() { Describe("upgrade-master", func() {
BeforeEach(func() {
SkipUnlessProviderIs("gce", "gke")
})
It("should maintain responsive services", func() { It("should maintain responsive services", func() {
By("Validating cluster before master upgrade") By("Validating cluster before master upgrade")
expectNoError(validate(f, svcName, rcName, ingress, replicas)) expectNoError(validate(f, svcName, rcName, ingress, replicas))
@ -265,15 +257,7 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() {
}) })
It("should maintain a functioning cluster", func() { It("should maintain a functioning cluster", func() {
SkipUnlessProviderIs("gce", "gke") By("Validating cluster before node upgrade")
By("Validating cluster before master upgrade")
expectNoError(validate(f, svcName, rcName, ingress, replicas))
By("Performing a master upgrade")
testMasterUpgrade(ip, v, masterUpgrade)
By("Checking master version")
expectNoError(checkMasterVersion(f.Client, v))
By("Validating cluster after master upgrade")
expectNoError(validate(f, svcName, rcName, ingress, replicas)) expectNoError(validate(f, svcName, rcName, ingress, replicas))
By("Performing a node upgrade") By("Performing a node upgrade")
testNodeUpgrade(f, nodeUpgrade, replicas, v) testNodeUpgrade(f, nodeUpgrade, replicas, v)