Skip to content

Commit 5c646c3

Browse files
Jituri, PranavJituri, Pranav
authored andcommitted
Revert "Merge pull request #1 from kubernetes/master"
This reverts commit 79ec204, reversing changes made to fea7e21.
1 parent d7ddb31 commit 5c646c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+469
-835
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Minikube Release Notes
22

3+
<<<<<<< HEAD
34
## Version 1.2.0 - 2019-06-24
45

56
* Update Kubernetes default version to v1.15.0 [#4534](https://github.com/kubernetes/minikube/pull/4534)
@@ -124,6 +125,8 @@ Huge thank you for this release towards our contributors:
124125
- u5surf
125126
- wj24021040
126127

128+
=======
129+
>>>>>>> Revert "Merge pull request #1 from kubernetes/master"
127130
## Version 1.1.0 - 2019-05-21
128131

129132
* Allow macOS to resolve service FQDNs during 'minikube tunnel' [#3464](https://github.com/kubernetes/minikube/pull/3464)

MAINTAINERS

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
Dan Lorenc <dlorenc@google.com> (@dlorenc)
2+
Lucas Käldström <lucas.kaldstrom@hotmail.co.uk> (@luxas)
3+
Jimmi Dyson <jimmidyson@gmail.com> (@jimmidyson)
14
Balint Pato <balintp@google.com> (@balopat)
5+
Priya Wadhwa <priyawadhwa@google.com> (@priyawadhwa)
26
Thomas Stromberg <tstromberg@google.com> (@tstromberg)
37
Anders F Björklund <anders.f.bjorklund@gmail.com> (@afbjorklund)
4-
Sharif Elgamal <selgamal@google.com> (@sharifelgamal)
5-
Medya Ghazizadeh <medya@google.com> (@medyagh)
8+
Sharif Elgamal <selgamal@google.com (@sharifelgamal)

OWNERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
reviewers:
4+
- dlorenc
45
- balopat
56
- tstromberg
67
- afbjorklund
78
- sharifelgamal
9+
<<<<<<< HEAD
810
- RA489
911
- medyagh
12+
=======
13+
>>>>>>> Revert "Merge pull request #1 from kubernetes/master"
1014
approvers:
15+
- dlorenc
16+
- luxas
17+
- jimmidyson
1118
- balopat
1219
- tstromberg
1320
- afbjorklund
1421
- sharifelgamal
22+
<<<<<<< HEAD
1523
- RA489
1624
- medyagh
1725
emeritus_approvers:
1826
- dlorenc
1927
- luxas
2028
- jimmidyson
29+
=======
30+
>>>>>>> Revert "Merge pull request #1 from kubernetes/master"

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,18 @@ minikube's [primary goals](https://github.com/kubernetes/minikube/blob/master/do
2121

2222
## News
2323

24+
<<<<<<< HEAD
2425
:mega: **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! :dancers:
2526

2627
* 2019-06-24 - v1.2.0 released! [[download](https://github.com/kubernetes/minikube/releases/tag/v1.2.0)] [[release notes](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md#version-120---2019-06-24)]
2728
* 2019-06-07 - v1.1.1 released! [[download](https://github.com/kubernetes/minikube/releases/tag/v1.1.1)] [[release notes](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md#version-111---2019-06-07)]
29+
=======
30+
>>>>>>> Revert "Merge pull request #1 from kubernetes/master"
2831
* 2019-05-21 - v1.1.0 released! [[download](https://github.com/kubernetes/minikube/releases/tag/v1.1.0)] [[release notes](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md#version-110---2019-05-21)]
2932

3033
## Features
3134

32-
minikube runs the latest stable release of Kubernetes, with support for standard Kubernetes features like:
35+
minikube runs the official stable release of Kubernetes, with support for standard Kubernetes features like:
3336

3437
* [LoadBalancer](https://github.com/kubernetes/minikube/blob/master/docs/tunnel.md) - using `minikube tunnel`
3538
* Multi-cluster - using `minikube start -p <name>`

cmd/minikube/cmd/config/config.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ var settings = []Setting{
131131
name: Bootstrapper,
132132
set: SetString, //TODO(r2d4): more validation here?
133133
},
134-
{
135-
name: config.ShowDriverDeprecationNotification,
136-
set: SetBool,
137-
},
138134
{
139135
name: config.ShowBootstrapperDeprecationNotification,
140136
set: SetBool,

cmd/minikube/cmd/config/open.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ minikube addons list`, addonName)
7676
exit.WithError("IsEnabled failed", err)
7777
}
7878
if !ok {
79-
console.ErrStyle(console.Conflict, `addon '%s' is currently not enabled.
79+
console.ErrStyle("conflict", `addon '%s' is currently not enabled.
8080
To enable this addon run:
8181
minikube addons enable %s`, addonName, addonName)
8282
os.Exit(exit.Unavailable)

cmd/minikube/cmd/config/validations.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func IsValidDriver(string, driver string) error {
5555

5656
// RequiresRestartMsg returns the "requires restart" message
5757
func RequiresRestartMsg(string, string) error {
58-
console.OutStyle(console.WarningType, "These changes will take effect upon a minikube delete and then a minikube start")
58+
console.OutStyle("warning", "These changes will take effect upon a minikube delete and then a minikube start")
5959
return nil
6060
}
6161

cmd/minikube/cmd/dashboard.go

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import (
2626
"regexp"
2727
"time"
2828

29-
"github.com/docker/machine/libmachine/mcnerror"
3029
"github.com/golang/glog"
3130
"github.com/pkg/browser"
3231
"github.com/pkg/errors"
3332
"github.com/spf13/cobra"
3433
configcmd "k8s.io/minikube/cmd/minikube/cmd/config"
3534
"k8s.io/minikube/pkg/minikube/assets"
3635
"k8s.io/minikube/pkg/minikube/cluster"
36+
"k8s.io/minikube/pkg/minikube/config"
3737
pkg_config "k8s.io/minikube/pkg/minikube/config"
3838
"k8s.io/minikube/pkg/minikube/console"
3939
"k8s.io/minikube/pkg/minikube/exit"
@@ -60,7 +60,15 @@ var dashboardCmd = &cobra.Command{
6060
if err != nil && !os.IsNotExist(err) {
6161
console.ErrLn("Error loading profile config: %v", err)
6262
}
63+
err = proxy.ExcludeIP(cc.KubernetesConfig.NodeIP) // to be used for http get calls
64+
if err != nil {
65+
glog.Errorf("Error excluding IP from proxy: %s", err)
66+
}
6367

68+
kubectl, err := exec.LookPath("kubectl")
69+
if err != nil {
70+
exit.WithCode(exit.NoInput, "kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/")
71+
}
6472
api, err := machine.NewAPIClient()
6573
defer func() {
6674
err := api.Close()
@@ -72,29 +80,9 @@ var dashboardCmd = &cobra.Command{
7280
if err != nil {
7381
exit.WithError("Error getting client", err)
7482
}
75-
76-
if _, err = api.Load(pkg_config.GetMachineName()); err != nil {
77-
switch err := errors.Cause(err).(type) {
78-
case mcnerror.ErrHostDoesNotExist:
79-
console.OutStyle(console.Meh, "%q cluster does not exist", pkg_config.GetMachineName())
80-
os.Exit(exit.Unavailable)
81-
default:
82-
exit.WithError("Error getting cluster", err)
83-
}
84-
}
85-
86-
err = proxy.ExcludeIP(cc.KubernetesConfig.NodeIP) // to be used for http get calls
87-
if err != nil {
88-
glog.Errorf("Error excluding IP from proxy: %s", err)
89-
}
90-
91-
kubectl, err := exec.LookPath("kubectl")
92-
if err != nil {
93-
exit.WithCode(exit.NoInput, "kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/")
94-
}
95-
9683
cluster.EnsureMinikubeRunningOrExit(api, 1)
9784

85+
<<<<<<< HEAD
9886
// Check dashboard status before enabling it
9987
dashboardAddon := assets.Addons["dashboard"]
10088
dashboardStatus, _ := dashboardAddon.IsEnabled()
@@ -106,31 +94,39 @@ var dashboardCmd = &cobra.Command{
10694
if err != nil {
10795
exit.WithError("Unable to enable dashboard", err)
10896
}
97+
=======
98+
// Send status messages to stderr for folks re-using this output.
99+
console.ErrStyle("enabling", "Enabling dashboard ...")
100+
// Enable the dashboard add-on
101+
err = configcmd.Set("dashboard", "true")
102+
if err != nil {
103+
exit.WithError("Unable to enable dashboard", err)
104+
>>>>>>> Revert "Merge pull request #1 from kubernetes/master"
109105
}
110106

111107
ns := "kube-system"
112108
svc := "kubernetes-dashboard"
113-
console.ErrStyle(console.Verifying, "Verifying dashboard health ...")
109+
console.ErrStyle("verifying", "Verifying dashboard health ...")
114110
if err = util.RetryAfter(180, func() error { return service.CheckService(ns, svc) }, 1*time.Second); err != nil {
115111
exit.WithCode(exit.Unavailable, "%s:%s is not running: %v", ns, svc, err)
116112
}
117113

118-
console.ErrStyle(console.Launch, "Launching proxy ...")
114+
console.ErrStyle("launch", "Launching proxy ...")
119115
p, hostPort, err := kubectlProxy(kubectl)
120116
if err != nil {
121117
exit.WithError("kubectl proxy", err)
122118
}
123119
url := dashboardURL(hostPort, ns, svc)
124120

125-
console.ErrStyle(console.Verifying, "Verifying proxy health ...")
121+
console.ErrStyle("verifying", "Verifying proxy health ...")
126122
if err = util.RetryAfter(60, func() error { return checkURL(url) }, 1*time.Second); err != nil {
127123
exit.WithCode(exit.Unavailable, "%s is not responding properly: %v", url, err)
128124
}
129125

130126
if dashboardURLMode {
131127
console.OutLn(url)
132128
} else {
133-
console.ErrStyle(console.Celebrate, "Opening %s in your default browser...", url)
129+
console.ErrStyle("celebrate", "Opening %s in your default browser...", url)
134130
if err = browser.OpenURL(url); err != nil {
135131
console.Failure("failed to open browser: %v", err)
136132
}
@@ -146,9 +142,9 @@ var dashboardCmd = &cobra.Command{
146142
// kubectlProxy runs "kubectl proxy", returning host:port
147143
func kubectlProxy(path string) (*exec.Cmd, string, error) {
148144
// port=0 picks a random system port
149-
// pkg_config.GetMachineName() respects the -p (profile) flag
145+
// config.GetMachineName() respects the -p (profile) flag
150146

151-
cmd := exec.Command(path, "--context", pkg_config.GetMachineName(), "proxy", "--port=0")
147+
cmd := exec.Command(path, "--context", config.GetMachineName(), "proxy", "--port=0")
152148

153149
stdoutPipe, err := cmd.StdoutPipe()
154150
if err != nil {

cmd/minikube/cmd/env.go

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
)
4242

4343
const (
44-
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 }}`
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 }}`
4545

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

109109
// ShellConfig represents the shell config
110110
type ShellConfig struct {
111-
Prefix string
112-
Delimiter string
113-
Suffix string
114-
DockerCertPath string
115-
DockerHost string
116-
DockerTLSVerify string
117-
UsageHint string
118-
NoProxyVar string
119-
NoProxyValue string
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
120121
}
121122

122123
var (
@@ -164,10 +165,11 @@ func shellCfgSet(api libmachine.API) (*ShellConfig, error) {
164165
}
165166

166167
shellCfg := &ShellConfig{
167-
DockerCertPath: envMap["DOCKER_CERT_PATH"],
168-
DockerHost: envMap["DOCKER_HOST"],
169-
DockerTLSVerify: envMap["DOCKER_TLS_VERIFY"],
170-
UsageHint: generateUsageHint(userShell),
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),
171173
}
172174

173175
if noProxy {
@@ -343,7 +345,7 @@ var dockerEnvCmd = &cobra.Command{
343345
if err != nil {
344346
exit.WithError("Error getting host", err)
345347
}
346-
if host.Driver.DriverName() == constants.DriverNone {
348+
if host.Driver.DriverName() == "none" {
347349
exit.Usage(`'none' driver does not support 'minikube docker-env' command`)
348350
}
349351
hostSt, err := cluster.GetHostStatus(api)

0 commit comments

Comments
 (0)