Skip to content

Commit a1a8b7d

Browse files
authored
Merge branch 'kubernetes:master' into master
2 parents 874de40 + ba699ac commit a1a8b7d

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

cmd/minikube/cmd/mount.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ var mountCmd = &cobra.Command{
193193
bindIP = "127.0.0.1"
194194
}
195195
out.Step(style.Mounting, "Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...", out.V{"sourcePath": hostPath, "destinationPath": vmPath})
196-
out.Infof("Mount type: {{.name}}", out.V{"type": cfg.Type})
196+
out.Infof("Mount type: {{.name}}", out.V{"name": cfg.Type})
197197
out.Infof("User ID: {{.userID}}", out.V{"userID": cfg.UID})
198198
out.Infof("Group ID: {{.groupID}}", out.V{"groupID": cfg.GID})
199199
out.Infof("Version: {{.version}}", out.V{"version": cfg.Version})

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ require (
6363
golang.org/x/crypto v0.6.0
6464
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561
6565
golang.org/x/mod v0.8.0
66-
golang.org/x/oauth2 v0.4.0
66+
golang.org/x/oauth2 v0.5.0
6767
golang.org/x/sync v0.1.0
6868
golang.org/x/sys v0.5.0
6969
golang.org/x/term v0.5.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1502,8 +1502,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri
15021502
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
15031503
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
15041504
golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A=
1505-
golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
1506-
golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
1505+
golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
1506+
golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
15071507
golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
15081508
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15091509
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

site/content/en/docs/handbook/config.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ For example the `minikube start --iso-url="$ISO_URL"` flag can also be set by se
113113

114114
Some features can only be accessed by minikube specific environment variables, here is a list of these features:
115115

116-
* **MINIKUBE_HOME** - (string) sets the path for the .minikube directory that minikube uses for state/configuration. *Please note: this is used only by minikube and does not affect anything related to Kubernetes tools such as kubectl.*
116+
* **MINIKUBE_HOME** - (string) sets the path for the .minikube directory that minikube uses for state/configuration. If you specify it to `/path/to/somewhere` and `somewhere` is not equal to `.minikube`, the final MINIKUBE_HOME will be `/path/to/somewhere/.minikube`. Defaults to `~/.minikube` if unspecified. *Please note: this is used only by minikube and does not affect anything related to Kubernetes tools such as kubectl.*
117117

118118
* **MINIKUBE_IN_STYLE** - (bool) manually sets whether or not emoji and colors should appear in minikube. Set to false or 0 to disable this feature, true or 1 to force it to be turned on.
119119

0 commit comments

Comments
 (0)