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

Decouple node upgrade from master upgrade

Browse Source
This commit is contained in:
Isaac Hollander McCreery 2016-02-25 13:37:16 -08:00
parent b94e15d6c1
commit 1bf69415cd
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/cluster_upgrade.go
View File

@ -211,10 +211,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))
@ -267,13 +263,7 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() {
It("should maintain a functioning cluster", func() { It("should maintain a functioning cluster", func() {
SkipUnlessProviderIs("gce", "gke") SkipUnlessProviderIs("gce", "gke")
By("Validating cluster before master upgrade") By("Validating cluster before node 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)