From 01c6ce889a17632081bd12a17172fa7138095be4 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 21 Jan 2021 17:21:23 -0800 Subject: [PATCH] better comments --- Makefile | 1 + test/integration/version_upgrade_test.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f61a0dbc28..41dad4e4bd 100644 --- a/Makefile +++ b/Makefile @@ -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" diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index 814abcc788..654eece8e3 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -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)