Addon heaspter is not in use

Fixes #5017. As per discussion, needed a rebase and this PR is rebased to latest master.
kubernetes · Oct 10, 2019 · 64f1e73 · 64f1e73
1 parent 5c6f33b
commit 64f1e73
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 276 deletions.
diff --git a/cmd/minikube/cmd/config/addons.go b/cmd/minikube/cmd/config/addons.go
@@ -25,7 +25,7 @@ import (
 var AddonsCmd = &cobra.Command{
 	Use:   "addons SUBCOMMAND [flags]",
 	Short: "Modify minikube's kubernetes addons",
-	Long:  `addons modifies minikube addons files using subcommands like "minikube addons enable heapster"`,
+	Long:  `addons modifies minikube addons files using subcommands like "minikube addons enable dashboard"`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := cmd.Help(); err != nil {
 			glog.Errorf("help: %v", err)

diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go
@@ -159,12 +159,6 @@ var settings = []Setting{
 		validations: []setFn{IsValidAddon},
 		callbacks:   []setFn{EnableOrDisableStorageClasses},
 	},
-	{
-		name:        "heapster",
-		set:         SetBool,
-		validations: []setFn{IsValidAddon},
-		callbacks:   []setFn{EnableOrDisableAddon},
-	},
 	{
 		name:        "efk",
 		set:         SetBool,

diff --git a/cmd/minikube/cmd/config/util_test.go b/cmd/minikube/cmd/config/util_test.go
@@ -91,10 +91,6 @@ func TestIsAddonAlreadySet(t *testing.T) {
 			addonName: "ingress",
 			expectErr: "addon ingress was already ",
 		},
-		{
-			addonName: "heapster",
-			expectErr: "addon heapster was already ",
-		},
 	}
 
 	for _, test := range testCases {

diff --git a/deploy/addons/heapster/grafana-svc.yaml.tmpl b/deploy/addons/heapster/grafana-svc.yaml.tmpl
diff --git a/deploy/addons/heapster/heapster-rc.yaml.tmpl b/deploy/addons/heapster/heapster-rc.yaml.tmpl
diff --git a/deploy/addons/heapster/heapster-svc.yaml.tmpl b/deploy/addons/heapster/heapster-svc.yaml.tmpl
diff --git a/deploy/addons/heapster/influx-grafana-rc.yaml.tmpl b/deploy/addons/heapster/influx-grafana-rc.yaml.tmpl
diff --git a/deploy/addons/heapster/influxdb-svc.yaml.tmpl b/deploy/addons/heapster/influxdb-svc.yaml.tmpl
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
@@ -132,38 +132,6 @@ var Addons = map[string]*Addon{
 			"0640",
 			false),
 	}, false, "storage-provisioner-gluster"),
-	"heapster": NewAddon([]*BinAsset{
-		MustBinAsset(
-			"deploy/addons/heapster/influx-grafana-rc.yaml.tmpl",
-			vmpath.GuestAddonsDir,
-			"influxGrafana-rc.yaml",
-			"0640",
-			true),
-		MustBinAsset(
-			"deploy/addons/heapster/grafana-svc.yaml.tmpl",
-			vmpath.GuestAddonsDir,
-			"grafana-svc.yaml",
-			"0640",
-			false),
-		MustBinAsset(
-			"deploy/addons/heapster/influxdb-svc.yaml.tmpl",
-			vmpath.GuestAddonsDir,
-			"influxdb-svc.yaml",
-			"0640",
-			false),
-		MustBinAsset(
-			"deploy/addons/heapster/heapster-rc.yaml.tmpl",
-			vmpath.GuestAddonsDir,
-			"heapster-rc.yaml",
-			"0640",
-			true),
-		MustBinAsset(
-			"deploy/addons/heapster/heapster-svc.yaml.tmpl",
-			vmpath.GuestAddonsDir,
-			"heapster-svc.yaml",
-			"0640",
-			false),
-	}, false, "heapster"),
 	"efk": NewAddon([]*BinAsset{
 		MustBinAsset(
 			"deploy/addons/efk/elasticsearch-rc.yaml.tmpl",

diff --git a/site/content/en/docs/Reference/Commands/addons.md b/site/content/en/docs/Reference/Commands/addons.md
@@ -4,7 +4,7 @@ linkTitle: "addons"
 weight: 1
 date: 2019-08-01
 description: >
-  Modifies minikube addons files using subcommands like "minikube addons enable heapster"
+  Modifies minikube addons files using subcommands like "minikube addons enable dashboard"
 ---
 
 ## Overview

diff --git a/site/content/en/docs/Reference/Commands/config.md b/site/content/en/docs/Reference/Commands/config.md
@@ -36,7 +36,6 @@ Configurable fields:
  * dashboard
  * addon-manager
  * default-storageclass
- * heapster
  * efk
  * ingress
  * registry

diff --git a/site/content/en/docs/Reference/Configuration/minikube.md b/site/content/en/docs/Reference/Configuration/minikube.md
@@ -77,7 +77,6 @@ Configurable fields:
  * dashboard
  * addon-manager
  * default-storageclass
- * heapster
  * efk
  * ingress
  * registry

diff --git a/site/content/en/docs/Tasks/addons.md b/site/content/en/docs/Tasks/addons.md
@@ -11,7 +11,6 @@ minikube has a set of built-in addons that, when enabled, can be used within Kub
 ## Available addons
 
 * [Kubernetes Dashboard](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dashboard)
-* [Heapster](https://github.com/kubernetes/heapster): [Troubleshooting Guide](https://github.com/kubernetes/heapster/blob/master/docs/influxdb.md) Note:You will need to login to Grafana as admin/admin in order to access the console
 * [EFK](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/fluentd-elasticsearch)
 * [Registry](https://github.com/kubernetes/minikube/tree/master/deploy/addons/registry)
 * [Registry Credentials](https://github.com/upmc-enterprises/registry-creds)
@@ -39,7 +38,6 @@ Example output:
 - freshpod: disabled
 - addon-manager: enabled
 - dashboard: enabled
-- heapster: disabled
 - efk: disabled
 - ingress: disabled
 - default-storageclass: enabled