Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use "kubectl proxy" instead of a NodePort to expose the dashboard. #3210

Merged
merged 16 commits into from
Oct 4, 2018
Merged

Use "kubectl proxy" instead of a NodePort to expose the dashboard. #3210

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
df54c6a
Use "kubectl proxy" instead of a NodePort to expose the dashboard.
tstromberg Oct 3, 2018
21776a0
Fix service port indentation.
tstromberg Oct 3, 2018
bc2dbe3
Improve readability of ISO download errors + include URL.
tstromberg Oct 3, 2018
ca9ca6f
Switch the label back to k8s-app instead of app for minikube compatib…
tstromberg Oct 3, 2018
8fd45bc
Block until the proxy URL is healthy.
tstromberg Oct 3, 2018
ac6dacf
Address lint issues resulting from the dashboard proxy refactor.
tstromberg Oct 3, 2018
4c35c50
Double HTTP wait time and make error messages more readable.
tstromberg Oct 3, 2018
2956621
Add function comments, improve proxy stdout log message
tstromberg Oct 3, 2018
d38705a
Fix overzealous replacement of namespace -> ns that broke URL generation
tstromberg Oct 3, 2018
c079bb1
Update integration tests to handle newly persistant dashboard.
tstromberg Oct 3, 2018
57054ac
Add missing reference to cmd.
tstromberg Oct 3, 2018
7feb46e
Removed unneccesary changes to download errors
tstromberg Oct 3, 2018
534325e
Use %v for errors instead of %s
tstromberg Oct 4, 2018
fd0d466
Respect the -p flag to set the appropriate profile.
tstromberg Oct 4, 2018
dc6d1ba
Merge branch 'master' into dashboard_on_demand
tstromberg Oct 4, 2018
687b62c
Let gofmt 1.10.4 rewrite service_test.go.
tstromberg Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add function comments, improve proxy stdout log message
  • Loading branch information
@tstromberg
tstromberg committed Oct 3, 2018
commit 2956621c20c048201c8884f3a26d6e294ac89240
5 changes: 4 additions & 1 deletion cmd/minikube/cmd/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
var (
dashboardURLMode bool
// Matches: 127.0.0.1:8001
// TODO(tstromberg): Get kubectl to implement a stable supported output format.
hostPortRe = regexp.MustCompile(`127.0.0.1:\d{4,}`)
)

Expand Down Expand Up @@ -119,15 +120,17 @@ func kubectlProxy() (*exec.Cmd, string, error) {
if err != nil {
return nil, "", errors.Wrap(err, "reading stdout pipe")
}
glog.Infof("Output: %s ...", out)
glog.Infof("proxy stdout: %s", out)
return cmd, hostPortRe.FindString(out), nil
}

// dashboardURL generates a URL for accessing the dashboard service
func dashboardURL(proxy string, ns string, svc string) string {
// Reference: https://github.com/kubernetes/dashboard/wiki/Accessing-Dashboard---1.7.X-and-above
return fmt.Sprintf("http://%s/api/v1/nss/%s/services/http:%s:/proxy/", proxy, ns, svc)
}

// checkURL checks if a URL returns 200 HTTP OK
func checkURL(url string) error {
resp, err := http.Get(url)
glog.Infof("%s response: %s %+v", url, err, resp)
tstromberg marked this conversation as resolved.
Show resolved Hide resolved
Expand Down