Merge pull request #4270 from tstromberg/proxy-restart

Test the upgrade of Kubernetes versions (oldest->newest)
pull/4278/head
Thomas Strömberg 2019-05-16 13:08:17 -07:00 committed by GitHub
commit 45439bb86b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions

View File

@ -17,6 +17,7 @@ limitations under the License.
package integration package integration
import ( import (
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
@ -26,6 +27,7 @@ import (
"github.com/docker/machine/libmachine/state" "github.com/docker/machine/libmachine/state"
"github.com/pkg/errors" "github.com/pkg/errors"
"k8s.io/minikube/pkg/minikube/constants"
pkgutil "k8s.io/minikube/pkg/util" pkgutil "k8s.io/minikube/pkg/util"
"k8s.io/minikube/test/integration/util" "k8s.io/minikube/test/integration/util"
) )
@ -63,19 +65,14 @@ func TestVersionUpgrade(t *testing.T) {
} }
} }
releaseRunner := util.MinikubeRunner{ releaseRunner := util.MinikubeRunner{BinaryPath: tf.Name(), T: t}
Args: currentRunner.Args, // For full coverage: also test upgrading from oldest to newest supported k8s release
BinaryPath: tf.Name(), releaseRunner.Start(fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion))
StartArgs: currentRunner.StartArgs,
MountArgs: currentRunner.MountArgs,
T: t,
}
releaseRunner.Start()
releaseRunner.CheckStatus(state.Running.String()) releaseRunner.CheckStatus(state.Running.String())
releaseRunner.RunCommand("stop", true) releaseRunner.RunCommand("stop", true)
releaseRunner.CheckStatus(state.Stopped.String()) releaseRunner.CheckStatus(state.Stopped.String())
currentRunner.Start() currentRunner.Start(fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion))
currentRunner.CheckStatus(state.Running.String()) currentRunner.CheckStatus(state.Running.String())
currentRunner.RunCommand("delete", true) currentRunner.RunCommand("delete", true)
currentRunner.CheckStatus(state.None.String()) currentRunner.CheckStatus(state.None.String())