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

Merge pull request #4364 from tstromberg/no-docker-version 

docker-env: Remove DOCKER_API_VERSION
pull/4370/head
Thomas Strömberg 2019-05-29 10:27:43 -07:00 committed by GitHub
parent c83d5f712d a3f557d870
commit db37c03063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 66 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/minikube/cmd/env.go
View File

@ -35,13 +35,12 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/cluster"
"k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/exit" "k8s.io/minikube/pkg/minikube/exit"
"k8s.io/minikube/pkg/minikube/machine" "k8s.io/minikube/pkg/minikube/machine"
) )
const ( const (
envTmpl = `{{ .Prefix }}DOCKER_TLS_VERIFY{{ .Delimiter }}{{ .DockerTLSVerify }}{{ .Suffix }}{{ .Prefix }}DOCKER_HOST{{ .Delimiter }}{{ .DockerHost }}{{ .Suffix }}{{ .Prefix }}DOCKER_CERT_PATH{{ .Delimiter }}{{ .DockerCertPath }}{{ .Suffix }}{{ .Prefix }}DOCKER_API_VERSION{{ .Delimiter }}{{ .DockerAPIVersion }}{{ .Suffix }}{{ if .NoProxyVar }}{{ .Prefix }}{{ .NoProxyVar }}{{ .Delimiter }}{{ .NoProxyValue }}{{ .Suffix }}{{end}}{{ .UsageHint }}` envTmpl = `{{ .Prefix }}DOCKER_TLS_VERIFY{{ .Delimiter }}{{ .DockerTLSVerify }}{{ .Suffix }}{{ .Prefix }}DOCKER_HOST{{ .Delimiter }}{{ .DockerHost }}{{ .Suffix }}{{ .Prefix }}DOCKER_CERT_PATH{{ .Delimiter }}{{ .DockerCertPath }}{{ .Suffix }}{{ if .NoProxyVar }}{{ .Prefix }}{{ .NoProxyVar }}{{ .Delimiter }}{{ .NoProxyValue }}{{ .Suffix }}{{end}}{{ .UsageHint }}`
fishSetPfx = "set -gx " fishSetPfx = "set -gx "
fishSetSfx = "\";\n" fishSetSfx = "\";\n"
@ -114,7 +113,6 @@ type ShellConfig struct {
DockerCertPath string DockerCertPath string
DockerHost string DockerHost string
DockerTLSVerify string DockerTLSVerify string
DockerAPIVersion string
UsageHint string UsageHint string
NoProxyVar string NoProxyVar string
NoProxyValue string NoProxyValue string
@ -168,7 +166,6 @@ func shellCfgSet(api libmachine.API) (*ShellConfig, error) {
DockerCertPath: envMap["DOCKER_CERT_PATH"], DockerCertPath: envMap["DOCKER_CERT_PATH"],
DockerHost: envMap["DOCKER_HOST"], DockerHost: envMap["DOCKER_HOST"],
DockerTLSVerify: envMap["DOCKER_TLS_VERIFY"], DockerTLSVerify: envMap["DOCKER_TLS_VERIFY"],
DockerAPIVersion: constants.DockerAPIVersion,
UsageHint: generateUsageHint(userShell), UsageHint: generateUsageHint(userShell),
} }

6
cmd/minikube/cmd/env_test.go
View File

@ -61,7 +61,6 @@ func newShellCfg(shell, prefix, suffix, delim string) *ShellConfig {
DockerCertPath: constants.MakeMiniPath("certs"), DockerCertPath: constants.MakeMiniPath("certs"),
DockerTLSVerify: "1", DockerTLSVerify: "1",
DockerHost: "tcp://127.0.0.1:2376", DockerHost: "tcp://127.0.0.1:2376",
DockerAPIVersion: constants.DockerAPIVersion,
UsageHint: generateUsageHint(shell), UsageHint: generateUsageHint(shell),
Prefix: prefix, Prefix: prefix,
Suffix: suffix, Suffix: suffix,
@ -144,7 +143,6 @@ func TestShellCfgSet(t *testing.T) {
DockerCertPath: constants.MakeMiniPath("certs"), DockerCertPath: constants.MakeMiniPath("certs"),
DockerTLSVerify: "1", DockerTLSVerify: "1",
DockerHost: "tcp://127.0.0.1:2376", DockerHost: "tcp://127.0.0.1:2376",
DockerAPIVersion: constants.DockerAPIVersion,
UsageHint: usageHintMap["bash"], UsageHint: usageHintMap["bash"],
Prefix: bashSetPfx, Prefix: bashSetPfx,
Suffix: bashSetSfx, Suffix: bashSetSfx,
@ -164,7 +162,6 @@ func TestShellCfgSet(t *testing.T) {
DockerCertPath: constants.MakeMiniPath("certs"), DockerCertPath: constants.MakeMiniPath("certs"),
DockerTLSVerify: "1", DockerTLSVerify: "1",
DockerHost: "tcp://127.0.0.1:2376", DockerHost: "tcp://127.0.0.1:2376",
DockerAPIVersion: constants.DockerAPIVersion,
UsageHint: usageHintMap["bash"], UsageHint: usageHintMap["bash"],
Prefix: bashSetPfx, Prefix: bashSetPfx,
Suffix: bashSetSfx, Suffix: bashSetSfx,
@ -184,7 +181,6 @@ func TestShellCfgSet(t *testing.T) {
DockerCertPath: constants.MakeMiniPath("certs"), DockerCertPath: constants.MakeMiniPath("certs"),
DockerTLSVerify: "1", DockerTLSVerify: "1",
DockerHost: "tcp://127.0.0.1:2376", DockerHost: "tcp://127.0.0.1:2376",
DockerAPIVersion: constants.DockerAPIVersion,
UsageHint: usageHintMap["bash"], UsageHint: usageHintMap["bash"],
Prefix: bashSetPfx, Prefix: bashSetPfx,
Suffix: bashSetSfx, Suffix: bashSetSfx,
@ -204,7 +200,6 @@ func TestShellCfgSet(t *testing.T) {
DockerCertPath: constants.MakeMiniPath("certs"), DockerCertPath: constants.MakeMiniPath("certs"),
DockerTLSVerify: "1", DockerTLSVerify: "1",
DockerHost: "tcp://127.0.0.1:2376", DockerHost: "tcp://127.0.0.1:2376",
DockerAPIVersion: constants.DockerAPIVersion,
UsageHint: usageHintMap["bash"], UsageHint: usageHintMap["bash"],
Prefix: bashSetPfx, Prefix: bashSetPfx,
Suffix: bashSetSfx, Suffix: bashSetSfx,
@ -224,7 +219,6 @@ func TestShellCfgSet(t *testing.T) {
DockerCertPath: constants.MakeMiniPath("certs"), DockerCertPath: constants.MakeMiniPath("certs"),
DockerTLSVerify: "1", DockerTLSVerify: "1",
DockerHost: "tcp://127.0.0.1:2376", DockerHost: "tcp://127.0.0.1:2376",
DockerAPIVersion: constants.DockerAPIVersion,
UsageHint: usageHintMap["bash"], UsageHint: usageHintMap["bash"],
Prefix: bashSetPfx, Prefix: bashSetPfx,
Suffix: bashSetSfx, Suffix: bashSetSfx,

3
pkg/minikube/constants/constants.go
View File

@ -181,9 +181,6 @@ func GetProfileFile(profile string) string {
return filepath.Join(GetMinipath(), "profiles", profile, "config.json") return filepath.Join(GetMinipath(), "profiles", profile, "config.json")
} }
// DockerAPIVersion is the API version implemented by Docker running in the minikube VM.
const DockerAPIVersion = "1.39"
// ReportingURL is the URL for reporting a minikube error // ReportingURL is the URL for reporting a minikube error
const ReportingURL = "https://clouderrorreporting.googleapis.com/v1beta1/projects/k8s-minikube/events:report?key=AIzaSyACUwzG0dEPcl-eOgpDKnyKoUFgHdfoFuA" const ReportingURL = "https://clouderrorreporting.googleapis.com/v1beta1/projects/k8s-minikube/events:report?key=AIzaSyACUwzG0dEPcl-eOgpDKnyKoUFgHdfoFuA"