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

Jump to bottom

Add heapster alias to metrics-server addon #8455

Merged
merged 6 commits into from
Jun 14, 2020
Merged

Add heapster alias to metrics-server addon #8455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d76b58c
Add heapster alias to metrics-server addon
govargo Jun 11, 2020
d7a9721
Avoid SIGSEGV when heapster addon will be disabled
govargo Jun 11, 2020
9d71fc6
remove unneccesary config
govargo Jun 11, 2020
803461d
if the specified addon doesn't exist, skip enabling
govargo Jun 11, 2020
24b2a69
fix disable heapster message
govargo Jun 12, 2020
ab58dca
replace to metrics-server in case of `minikube start --addons heapster`
govargo Jun 12, 2020
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
3 changes: 3 additions & 0 deletions cmd/minikube/cmd/config/disable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ var addonsDisableCmd = &cobra.Command{
}

addon := args[0]
if addon == "heapster" {
exit.WithCodeT(exit.Unavailable, "The heapster addon is depreciated. please try to disable metrics-server instead")
}
err := addons.SetAndSave(ClusterFlagValue(), addon, "false")
if err != nil {
exit.WithError("disable failed", err)
Expand Down
5 changes: 5 additions & 0 deletions cmd/minikube/cmd/config/enable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ var addonsEnableCmd = &cobra.Command{
exit.UsageT("usage: minikube addons enable ADDON_NAME")
}
addon := args[0]
// replace heapster as metrics-server because heapster is deprecated
if addon == "heapster" {
out.T(out.Waiting, "enable metrics-server addon instead of heapster addon because heapster is deprecated")
addon = "metrics-server"
}
err := addons.SetAndSave(ClusterFlagValue(), addon, "true")
if err != nil {
exit.WithError("enable failed", err)
Expand Down
10 changes: 9 additions & 1 deletion pkg/addons/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,15 @@ func Start(wg *sync.WaitGroup, cc *config.ClusterConfig, toEnable map[string]boo

// Apply new addons
for _, name := range additional {
toEnable[name] = true
// replace heapster as metrics-server because heapster is deprecated
if name == "heapster" {
name = "metrics-server"
}
// if the specified addon doesn't exist, skip enabling
_, e := isAddonValid(name)
if e {
toEnable[name] = true
}
}

toEnableList := []string{}
Expand Down