From 1c516924ef8cfe808c12ec799ba87490331f4229 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 2 Apr 2020 19:44:09 -0700 Subject: [PATCH 1/5] go import and gofmt --- cmd/minikube/cmd/config/configure.go | 18 +++++++++--------- deploy/minikube/release_sanity_test.go | 1 - pkg/minikube/config/config_test.go | 8 ++++---- pkg/minikube/service/service_test.go | 24 ++++++++++++------------ pkg/util/crypto.go | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go index 412fa1204d..80c61d1c99 100644 --- a/cmd/minikube/cmd/config/configure.go +++ b/cmd/minikube/cmd/config/configure.go @@ -113,8 +113,8 @@ var addonsConfigureCmd = &cobra.Command{ "aws-assume-role": awsRole, }, map[string]string{ - "app": "registry-creds", - "cloud": "ecr", + "app": "registry-creds", + "cloud": "ecr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -128,11 +128,11 @@ var addonsConfigureCmd = &cobra.Command{ "registry-creds-gcr", map[string]string{ "application_default_credentials.json": gcrApplicationDefaultCredentials, - "gcrurl": gcrURL, + "gcrurl": gcrURL, }, map[string]string{ - "app": "registry-creds", - "cloud": "gcr", + "app": "registry-creds", + "cloud": "gcr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -150,8 +150,8 @@ var addonsConfigureCmd = &cobra.Command{ "DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass, }, map[string]string{ - "app": "registry-creds", - "cloud": "dpr", + "app": "registry-creds", + "cloud": "dpr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -169,8 +169,8 @@ var addonsConfigureCmd = &cobra.Command{ "ACR_PASSWORD": acrPassword, }, map[string]string{ - "app": "registry-creds", - "cloud": "acr", + "app": "registry-creds", + "cloud": "acr", "kubernetes.io/minikube-addons": "registry-creds", }) diff --git a/deploy/minikube/release_sanity_test.go b/deploy/minikube/release_sanity_test.go index 22bb29d9c7..8817606af5 100644 --- a/deploy/minikube/release_sanity_test.go +++ b/deploy/minikube/release_sanity_test.go @@ -26,7 +26,6 @@ import ( "testing" retryablehttp "github.com/hashicorp/go-retryablehttp" - "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/notify" "k8s.io/minikube/pkg/util" ) diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go index 028d094443..a9548bb2c5 100644 --- a/pkg/minikube/config/config_test.go +++ b/pkg/minikube/config/config_test.go @@ -50,10 +50,10 @@ var configTestCases = []configTestCase{ "v": 5 }`, config: map[string]interface{}{ - "driver": "test-driver", - "cpus": 4, - "disk-size": "20g", - "v": 5, + "driver": "test-driver", + "cpus": 4, + "disk-size": "20g", + "v": 5, "show-libmachine-logs": true, "log_dir": "/etc/hosts", "ReminderWaitPeriodInHours": 99, diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go index 449c55343b..dc7a9a273a 100644 --- a/pkg/minikube/service/service_test.go +++ b/pkg/minikube/service/service_test.go @@ -370,30 +370,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) { expectedIsHTTPSchemedURL bool }{ { - description: "no https for http schemed with no https option", - bareURLString: "http://192.168.99.100:30563", - https: false, + description: "no https for http schemed with no https option", + bareURLString: "http://192.168.99.100:30563", + https: false, expectedHTTPSFormattedURLString: "http://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with no https option", - bareURLString: "xyz.http.myservice:30563", - https: false, + description: "no https for non-http schemed with no https option", + bareURLString: "xyz.http.myservice:30563", + https: false, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, { - description: "https for http schemed with https option", - bareURLString: "http://192.168.99.100:30563", - https: true, + description: "https for http schemed with https option", + bareURLString: "http://192.168.99.100:30563", + https: true, expectedHTTPSFormattedURLString: "https://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with https option and http substring", - bareURLString: "xyz.http.myservice:30563", - https: true, + description: "no https for non-http schemed with https option and http substring", + bareURLString: "xyz.http.myservice:30563", + https: true, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, diff --git a/pkg/util/crypto.go b/pkg/util/crypto.go index 417417e215..500b9813e0 100644 --- a/pkg/util/crypto.go +++ b/pkg/util/crypto.go @@ -53,7 +53,7 @@ func GenerateCACert(certPath, keyPath string, name string) error { KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv) From 62e3b74652056341a97acfaa7a33a4efe4cdef23 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 3 Apr 2020 00:08:32 -0700 Subject: [PATCH 2/5] adjust github actions --- .github/workflows/main.yml | 6 +++--- test/integration/functional_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf6ed4730b..928f2638c3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -127,7 +127,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -216,7 +216,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -459,7 +459,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=1.3 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=30m -test.v -timeout-multiplier=1 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index 61f3569951..7ddbe72fb5 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -731,7 +731,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) { rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "mysql", "-ppassword", "-e", "show databases;")) return err } - if err = retry.Expo(mysql, 1*time.Second, Seconds(200)); err != nil { + if err = retry.Expo(mysql, 1*time.Second, Minutes(5)); err != nil { t.Errorf("failed to exec 'mysql -ppassword -e show databases;': %v", err) } } From 31ee6650de8963d3793a3111a132bd6cf398a522 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 3 Apr 2020 00:09:51 -0700 Subject: [PATCH 3/5] go import after gofmt --- cmd/minikube/cmd/config/configure.go | 18 +++++++++--------- m.sh | 7 +++++++ pkg/minikube/config/config_test.go | 8 ++++---- pkg/minikube/service/service_test.go | 24 ++++++++++++------------ pkg/util/crypto.go | 2 +- 5 files changed, 33 insertions(+), 26 deletions(-) create mode 100755 m.sh diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go index 80c61d1c99..412fa1204d 100644 --- a/cmd/minikube/cmd/config/configure.go +++ b/cmd/minikube/cmd/config/configure.go @@ -113,8 +113,8 @@ var addonsConfigureCmd = &cobra.Command{ "aws-assume-role": awsRole, }, map[string]string{ - "app": "registry-creds", - "cloud": "ecr", + "app": "registry-creds", + "cloud": "ecr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -128,11 +128,11 @@ var addonsConfigureCmd = &cobra.Command{ "registry-creds-gcr", map[string]string{ "application_default_credentials.json": gcrApplicationDefaultCredentials, - "gcrurl": gcrURL, + "gcrurl": gcrURL, }, map[string]string{ - "app": "registry-creds", - "cloud": "gcr", + "app": "registry-creds", + "cloud": "gcr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -150,8 +150,8 @@ var addonsConfigureCmd = &cobra.Command{ "DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass, }, map[string]string{ - "app": "registry-creds", - "cloud": "dpr", + "app": "registry-creds", + "cloud": "dpr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -169,8 +169,8 @@ var addonsConfigureCmd = &cobra.Command{ "ACR_PASSWORD": acrPassword, }, map[string]string{ - "app": "registry-creds", - "cloud": "acr", + "app": "registry-creds", + "cloud": "acr", "kubernetes.io/minikube-addons": "registry-creds", }) diff --git a/m.sh b/m.sh new file mode 100755 index 0000000000..8a4e4b7562 --- /dev/null +++ b/m.sh @@ -0,0 +1,7 @@ +for file in $(find . -type f -name "*.go") +do + if [[ -f $file ]]; then + gofmt -w $file + goimports -w $file + fi +done \ No newline at end of file diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go index a9548bb2c5..028d094443 100644 --- a/pkg/minikube/config/config_test.go +++ b/pkg/minikube/config/config_test.go @@ -50,10 +50,10 @@ var configTestCases = []configTestCase{ "v": 5 }`, config: map[string]interface{}{ - "driver": "test-driver", - "cpus": 4, - "disk-size": "20g", - "v": 5, + "driver": "test-driver", + "cpus": 4, + "disk-size": "20g", + "v": 5, "show-libmachine-logs": true, "log_dir": "/etc/hosts", "ReminderWaitPeriodInHours": 99, diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go index dc7a9a273a..449c55343b 100644 --- a/pkg/minikube/service/service_test.go +++ b/pkg/minikube/service/service_test.go @@ -370,30 +370,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) { expectedIsHTTPSchemedURL bool }{ { - description: "no https for http schemed with no https option", - bareURLString: "http://192.168.99.100:30563", - https: false, + description: "no https for http schemed with no https option", + bareURLString: "http://192.168.99.100:30563", + https: false, expectedHTTPSFormattedURLString: "http://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with no https option", - bareURLString: "xyz.http.myservice:30563", - https: false, + description: "no https for non-http schemed with no https option", + bareURLString: "xyz.http.myservice:30563", + https: false, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, { - description: "https for http schemed with https option", - bareURLString: "http://192.168.99.100:30563", - https: true, + description: "https for http schemed with https option", + bareURLString: "http://192.168.99.100:30563", + https: true, expectedHTTPSFormattedURLString: "https://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with https option and http substring", - bareURLString: "xyz.http.myservice:30563", - https: true, + description: "no https for non-http schemed with https option and http substring", + bareURLString: "xyz.http.myservice:30563", + https: true, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, diff --git a/pkg/util/crypto.go b/pkg/util/crypto.go index 500b9813e0..417417e215 100644 --- a/pkg/util/crypto.go +++ b/pkg/util/crypto.go @@ -53,7 +53,7 @@ func GenerateCACert(certPath, keyPath string, name string) error { KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv) From b346fd9890c7c5d448e970f7c9c799f8f3b20abb Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 3 Apr 2020 00:10:03 -0700 Subject: [PATCH 4/5] remove script --- m.sh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 m.sh diff --git a/m.sh b/m.sh deleted file mode 100755 index 8a4e4b7562..0000000000 --- a/m.sh +++ /dev/null @@ -1,7 +0,0 @@ -for file in $(find . -type f -name "*.go") -do - if [[ -f $file ]]; then - gofmt -w $file - goimports -w $file - fi -done \ No newline at end of file From 0ccb077a7f05900354e2f70a0304a7a5e01edad3 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 3 Apr 2020 20:56:33 -0700 Subject: [PATCH 5/5] adjust none --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 928f2638c3..ca58baa169 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -127,7 +127,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -216,7 +216,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -297,7 +297,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=50m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=35m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -378,7 +378,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=50m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=35m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60))