Skip to content

Commit db37c03

Browse files
tstrombergtstromberg
authoredMay 29, 2019
Merge pull request #4364 from tstromberg/no-docker-version
docker-env: Remove DOCKER_API_VERSION
·
v1.35.0v1.1.1
2 parents c83d5f7 + a3f557d commit db37c03

File tree

3 files changed

+66
-78
lines changed

3 files changed

+66
-78
lines changed
 

Diff for: ‎cmd/minikube/cmd/env.go

+14-17
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ import (
3535
"github.com/spf13/cobra"
3636
"k8s.io/minikube/pkg/minikube/cluster"
3737
"k8s.io/minikube/pkg/minikube/config"
38-
"k8s.io/minikube/pkg/minikube/constants"
3938
"k8s.io/minikube/pkg/minikube/exit"
4039
"k8s.io/minikube/pkg/minikube/machine"
4140
)
4241

4342
const (
44-
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 }}`
43+
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 }}`
4544

4645
fishSetPfx = "set -gx "
4746
fishSetSfx = "\";\n"
@@ -108,16 +107,15 @@ REM @FOR /f "tokens=*" %i IN ('minikube docker-env') DO @%i
108107

109108
// ShellConfig represents the shell config
110109
type ShellConfig struct {
111-
Prefix string
112-
Delimiter string
113-
Suffix string
114-
DockerCertPath string
115-
DockerHost string
116-
DockerTLSVerify string
117-
DockerAPIVersion string
118-
UsageHint string
119-
NoProxyVar string
120-
NoProxyValue string
110+
Prefix string
111+
Delimiter string
112+
Suffix string
113+
DockerCertPath string
114+
DockerHost string
115+
DockerTLSVerify string
116+
UsageHint string
117+
NoProxyVar string
118+
NoProxyValue string
121119
}
122120

123121
var (
@@ -165,11 +163,10 @@ func shellCfgSet(api libmachine.API) (*ShellConfig, error) {
165163
}
166164

167165
shellCfg := &ShellConfig{
168-
DockerCertPath: envMap["DOCKER_CERT_PATH"],
169-
DockerHost: envMap["DOCKER_HOST"],
170-
DockerTLSVerify: envMap["DOCKER_TLS_VERIFY"],
171-
DockerAPIVersion: constants.DockerAPIVersion,
172-
UsageHint: generateUsageHint(userShell),
166+
DockerCertPath: envMap["DOCKER_CERT_PATH"],
167+
DockerHost: envMap["DOCKER_HOST"],
168+
DockerTLSVerify: envMap["DOCKER_TLS_VERIFY"],
169+
UsageHint: generateUsageHint(userShell),
173170
}
174171

175172
if noProxy {

Diff for: ‎cmd/minikube/cmd/env_test.go

+52-58
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,13 @@ var defaultAPI = &tests.MockAPI{
5858
// Most of the shell cfg isn't configurable
5959
func newShellCfg(shell, prefix, suffix, delim string) *ShellConfig {
6060
return &ShellConfig{
61-
DockerCertPath: constants.MakeMiniPath("certs"),
62-
DockerTLSVerify: "1",
63-
DockerHost: "tcp://127.0.0.1:2376",
64-
DockerAPIVersion: constants.DockerAPIVersion,
65-
UsageHint: generateUsageHint(shell),
66-
Prefix: prefix,
67-
Suffix: suffix,
68-
Delimiter: delim,
61+
DockerCertPath: constants.MakeMiniPath("certs"),
62+
DockerTLSVerify: "1",
63+
DockerHost: "tcp://127.0.0.1:2376",
64+
UsageHint: generateUsageHint(shell),
65+
Prefix: prefix,
66+
Suffix: suffix,
67+
Delimiter: delim,
6968
}
7069
}
7170

@@ -141,16 +140,15 @@ func TestShellCfgSet(t *testing.T) {
141140
noProxyValue: "",
142141
noProxyFlag: true,
143142
expectedShellCfg: &ShellConfig{
144-
DockerCertPath: constants.MakeMiniPath("certs"),
145-
DockerTLSVerify: "1",
146-
DockerHost: "tcp://127.0.0.1:2376",
147-
DockerAPIVersion: constants.DockerAPIVersion,
148-
UsageHint: usageHintMap["bash"],
149-
Prefix: bashSetPfx,
150-
Suffix: bashSetSfx,
151-
Delimiter: bashSetDelim,
152-
NoProxyVar: "NO_PROXY",
153-
NoProxyValue: "127.0.0.1",
143+
DockerCertPath: constants.MakeMiniPath("certs"),
144+
DockerTLSVerify: "1",
145+
DockerHost: "tcp://127.0.0.1:2376",
146+
UsageHint: usageHintMap["bash"],
147+
Prefix: bashSetPfx,
148+
Suffix: bashSetSfx,
149+
Delimiter: bashSetDelim,
150+
NoProxyVar: "NO_PROXY",
151+
NoProxyValue: "127.0.0.1",
154152
},
155153
},
156154
{
@@ -161,16 +159,15 @@ func TestShellCfgSet(t *testing.T) {
161159
noProxyValue: "",
162160
noProxyFlag: true,
163161
expectedShellCfg: &ShellConfig{
164-
DockerCertPath: constants.MakeMiniPath("certs"),
165-
DockerTLSVerify: "1",
166-
DockerHost: "tcp://127.0.0.1:2376",
167-
DockerAPIVersion: constants.DockerAPIVersion,
168-
UsageHint: usageHintMap["bash"],
169-
Prefix: bashSetPfx,
170-
Suffix: bashSetSfx,
171-
Delimiter: bashSetDelim,
172-
NoProxyVar: "no_proxy",
173-
NoProxyValue: "127.0.0.1",
162+
DockerCertPath: constants.MakeMiniPath("certs"),
163+
DockerTLSVerify: "1",
164+
DockerHost: "tcp://127.0.0.1:2376",
165+
UsageHint: usageHintMap["bash"],
166+
Prefix: bashSetPfx,
167+
Suffix: bashSetSfx,
168+
Delimiter: bashSetDelim,
169+
NoProxyVar: "no_proxy",
170+
NoProxyValue: "127.0.0.1",
174171
},
175172
},
176173
{
@@ -181,16 +178,15 @@ func TestShellCfgSet(t *testing.T) {
181178
noProxyValue: "127.0.0.1",
182179
noProxyFlag: true,
183180
expectedShellCfg: &ShellConfig{
184-
DockerCertPath: constants.MakeMiniPath("certs"),
185-
DockerTLSVerify: "1",
186-
DockerHost: "tcp://127.0.0.1:2376",
187-
DockerAPIVersion: constants.DockerAPIVersion,
188-
UsageHint: usageHintMap["bash"],
189-
Prefix: bashSetPfx,
190-
Suffix: bashSetSfx,
191-
Delimiter: bashSetDelim,
192-
NoProxyVar: "no_proxy",
193-
NoProxyValue: "127.0.0.1",
181+
DockerCertPath: constants.MakeMiniPath("certs"),
182+
DockerTLSVerify: "1",
183+
DockerHost: "tcp://127.0.0.1:2376",
184+
UsageHint: usageHintMap["bash"],
185+
Prefix: bashSetPfx,
186+
Suffix: bashSetSfx,
187+
Delimiter: bashSetDelim,
188+
NoProxyVar: "no_proxy",
189+
NoProxyValue: "127.0.0.1",
194190
},
195191
},
196192
{
@@ -201,16 +197,15 @@ func TestShellCfgSet(t *testing.T) {
201197
noProxyValue: "0.0.0.0",
202198
noProxyFlag: true,
203199
expectedShellCfg: &ShellConfig{
204-
DockerCertPath: constants.MakeMiniPath("certs"),
205-
DockerTLSVerify: "1",
206-
DockerHost: "tcp://127.0.0.1:2376",
207-
DockerAPIVersion: constants.DockerAPIVersion,
208-
UsageHint: usageHintMap["bash"],
209-
Prefix: bashSetPfx,
210-
Suffix: bashSetSfx,
211-
Delimiter: bashSetDelim,
212-
NoProxyVar: "no_proxy",
213-
NoProxyValue: "0.0.0.0,127.0.0.1",
200+
DockerCertPath: constants.MakeMiniPath("certs"),
201+
DockerTLSVerify: "1",
202+
DockerHost: "tcp://127.0.0.1:2376",
203+
UsageHint: usageHintMap["bash"],
204+
Prefix: bashSetPfx,
205+
Suffix: bashSetSfx,
206+
Delimiter: bashSetDelim,
207+
NoProxyVar: "no_proxy",
208+
NoProxyValue: "0.0.0.0,127.0.0.1",
214209
},
215210
},
216211
{
@@ -221,16 +216,15 @@ func TestShellCfgSet(t *testing.T) {
221216
noProxyValue: "0.0.0.0,127.0.0.1",
222217
noProxyFlag: true,
223218
expectedShellCfg: &ShellConfig{
224-
DockerCertPath: constants.MakeMiniPath("certs"),
225-
DockerTLSVerify: "1",
226-
DockerHost: "tcp://127.0.0.1:2376",
227-
DockerAPIVersion: constants.DockerAPIVersion,
228-
UsageHint: usageHintMap["bash"],
229-
Prefix: bashSetPfx,
230-
Suffix: bashSetSfx,
231-
Delimiter: bashSetDelim,
232-
NoProxyVar: "no_proxy",
233-
NoProxyValue: "0.0.0.0,127.0.0.1",
219+
DockerCertPath: constants.MakeMiniPath("certs"),
220+
DockerTLSVerify: "1",
221+
DockerHost: "tcp://127.0.0.1:2376",
222+
UsageHint: usageHintMap["bash"],
223+
Prefix: bashSetPfx,
224+
Suffix: bashSetSfx,
225+
Delimiter: bashSetDelim,
226+
NoProxyVar: "no_proxy",
227+
NoProxyValue: "0.0.0.0,127.0.0.1",
234228
},
235229
},
236230
}

Diff for: ‎pkg/minikube/constants/constants.go

-3
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,6 @@ func GetProfileFile(profile string) string {
181181
return filepath.Join(GetMinipath(), "profiles", profile, "config.json")
182182
}
183183

184-
// DockerAPIVersion is the API version implemented by Docker running in the minikube VM.
185-
const DockerAPIVersion = "1.39"
186-
187184
// ReportingURL is the URL for reporting a minikube error
188185
const ReportingURL = "https://clouderrorreporting.googleapis.com/v1beta1/projects/k8s-minikube/events:report?key=AIzaSyACUwzG0dEPcl-eOgpDKnyKoUFgHdfoFuA"
189186

0 commit comments

Comments
 (0)
Please sign in to comment.