Skip to content

Commit 804e772

Browse files
authored
Merge pull request #8455 from govargo/add-heapster-alias
Add heapster alias to metrics-server addon
2 parents 101b612 + ab58dca commit 804e772

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

cmd/minikube/cmd/config/disable.go

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ var addonsDisableCmd = &cobra.Command{
3333
}
3434

3535
addon := args[0]
36+
if addon == "heapster" {
37+
exit.WithCodeT(exit.Unavailable, "The heapster addon is depreciated. please try to disable metrics-server instead")
38+
}
3639
err := addons.SetAndSave(ClusterFlagValue(), addon, "false")
3740
if err != nil {
3841
exit.WithError("disable failed", err)

cmd/minikube/cmd/config/enable.go

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ var addonsEnableCmd = &cobra.Command{
3232
exit.UsageT("usage: minikube addons enable ADDON_NAME")
3333
}
3434
addon := args[0]
35+
// replace heapster as metrics-server because heapster is deprecated
36+
if addon == "heapster" {
37+
out.T(out.Waiting, "enable metrics-server addon instead of heapster addon because heapster is deprecated")
38+
addon = "metrics-server"
39+
}
3540
err := addons.SetAndSave(ClusterFlagValue(), addon, "true")
3641
if err != nil {
3742
exit.WithError("enable failed", err)

pkg/addons/addons.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,15 @@ func Start(wg *sync.WaitGroup, cc *config.ClusterConfig, toEnable map[string]boo
334334

335335
// Apply new addons
336336
for _, name := range additional {
337-
toEnable[name] = true
337+
// replace heapster as metrics-server because heapster is deprecated
338+
if name == "heapster" {
339+
name = "metrics-server"
340+
}
341+
// if the specified addon doesn't exist, skip enabling
342+
_, e := isAddonValid(name)
343+
if e {
344+
toEnable[name] = true
345+
}
338346
}
339347

340348
toEnableList := []string{}

0 commit comments

Comments
 (0)