kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

better comments

pull/10211/head
Medya Gh 2021-01-21 17:21:23 -08:00
parent 1b93e9df2c
commit 01c6ce889a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -301,6 +301,7 @@ integration-versioned: out/minikube ## Trigger minikube integration testing, log
.PHONY: functional
functional: integration-functional-only
.PHONY: integration-functional-only
integration-functional-only: out/minikube$(IS_EXE) ## Trigger only functioanl tests in integration test, logs to ./out/testout_COMMIT.txt
go test -ldflags="${MINIKUBE_LDFLAGS}" -v -test.timeout=20m $(INTEGRATION_TESTS_TO_RUN) --tags="$(MINIKUBE_INTEGRATION_BUILD_TAGS)" $(TEST_ARGS) -test.run TestFunctional 2>&1 | tee "./out/testout_$(COMMIT_SHORT).txt"

6
test/integration/version_upgrade_test.go
View File

@ -141,9 +141,9 @@ func TestStoppedBinaryUpgrade(t *testing.T) {
r := func() error {
c := exec.CommandContext(ctx, tf.Name(), args...)
legacyEnv := []string{}
// replace KUBECONFIG env glboally with our own one for this test
// because older minikube than 1.17.0 can not read the new kubeconfigs with "Extenions"
// https://github.com/kubernetes/minikube/issues/10210
// replace the global KUBECONFIG with a fresh kubeconfig
// because for minikube<1.17.0 it can not read the new kubeconfigs that have extra "Extenions" block
// see: https://github.com/kubernetes/minikube/issues/10210
for _, e := range os.Environ() {
if !strings.Contains(e, "KUBECONFIG") { // get all global envs except the Kubeconfig which is used by new versions of minikubes
legacyEnv = append(legacyEnv, e)