removes heapster

Fixes #5017. As per discussion, needed a rebase and this PR is rebased to latest master.
kubernetes · Sep 2, 2019 · 2c34404 · 2c34404
1 parent b0204cd
commit 2c34404
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 245 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/go.sum b/go.sum
@@ -649,7 +649,6 @@ grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJd
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
 k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
 k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

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)
@@ -37,7 +36,6 @@ Example output:
 - freshpod: disabled
 - addon-manager: enabled
 - dashboard: enabled
-- heapster: disabled
 - efk: disabled
 - ingress: disabled
 - default-storageclass: enabled