Merge pull request #740 from JoshVanL/718-grafana-heapster-influxdb-t…

…oggle Add config toggle for heapster, influxdb, grafana
jetstack · Feb 12, 2019 · 8b526d4 · 8b526d4
2 parents 6a24497 + 17186d3
commit 8b526d4
Show file tree

Hide file tree

Showing 13 changed files with 298 additions and 19 deletions.
diff --git a/docs/generated/reference/output/api-docs.html b/docs/generated/reference/output/api-docs.html
diff --git a/docs/generated/reference/output/navData.js b/docs/generated/reference/output/navData.js
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -40,6 +40,7 @@ Golang
 Grafana
 gz
 Hashicorp
+heapster
 heptio
 hostname
 iam

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
@@ -976,6 +976,19 @@ Enabling Typha, along with setting the number of replicas is shown above.
 Cluster Services
 ----------------
 
+Deploying Grafana, InfluxDB and Heapster can be toggled in the Tarmak
+configuration like follows:
+
+.. code-block:: yaml
+
+   kubernetes:
+     grafana:
+       enabled: true
+     heapster:
+       enabled: false
+     influxDB:
+       enabled: true
+
 Grafana
 ~~~~~~~
 

diff --git a/pkg/apis/cluster/v1alpha1/cluster.go b/pkg/apis/cluster/v1alpha1/cluster.go
@@ -96,6 +96,9 @@ type ClusterKubernetes struct {
 	Dashboard         *ClusterKubernetesDashboard         `json:"dashboard,omitempty"`
 	PodSecurityPolicy *ClusterPodSecurityPolicy           `json:"podSecurityPolicy,omitempty"`
 	Prometheus        *ClusterKubernetesPrometheus        `json:"prometheus,omitempty"`
+	Grafana           *ClusterKubernetesGrafana           `json:"grafana,omiempty"`
+	Heapster          *ClusterKubernetesHeapster          `json:"heapster,omiempty"`
+	InfluxDB          *ClusterKubernetesInfluxDB          `json:"influxDB,omiempty"`
 
 	APIServer         *ClusterKubernetesAPIServer         `json:"apiServer,omitempty"`
 	Kubelet           *ClusterKubernetesKubelet           `json:"kubelet,omitempty"`
@@ -214,6 +217,18 @@ type ClusterKubernetesPrometheus struct {
 	Mode string `json:"mode,omitempty"`
 }
 
+type ClusterKubernetesGrafana struct {
+	Enabled bool `json:"enabled,omitempty"`
+}
+
+type ClusterKubernetesHeapster struct {
+	Enabled bool `json:"enabled,omitempty"`
+}
+
+type ClusterKubernetesInfluxDB struct {
+	Enabled bool `json:"enabled,omitempty"`
+}
+
 type ClusterVaultHelper struct {
 	URL string `json:"url,omitempty"`
 }

diff --git a/pkg/apis/cluster/v1alpha1/defaults.go b/pkg/apis/cluster/v1alpha1/defaults.go
@@ -87,6 +87,24 @@ func SetDefaults_Cluster(obj *Cluster) {
 		obj.Kubernetes.Calico.TyphaReplicas = intPointer(1)
 	}
 
+	if obj.Kubernetes.Heapster == nil {
+		obj.Kubernetes.Heapster = &ClusterKubernetesHeapster{
+			Enabled: true,
+		}
+	}
+
+	if obj.Kubernetes.Grafana == nil {
+		obj.Kubernetes.Grafana = &ClusterKubernetesGrafana{
+			Enabled: true,
+		}
+	}
+
+	if obj.Kubernetes.InfluxDB == nil {
+		obj.Kubernetes.InfluxDB = &ClusterKubernetesInfluxDB{
+			Enabled: true,
+		}
+	}
+
 	// EBS encryption off if Amazon interface used
 	// but EBSEncrypted not specified
 	if obj.Amazon == nil {

diff --git a/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/puppet/puppet.go b/pkg/puppet/puppet.go
@@ -333,6 +333,18 @@ func kubernetesClusterConfigPerRole(conf *clusterv1alpha1.ClusterKubernetes, rol
 		}
 	}
 
+	if g := conf.Grafana; g != nil {
+		hieraData.variables = append(hieraData.variables, fmt.Sprintf(`kubernetes_addons::grafana::enabled: %t`, conf.Grafana.Enabled))
+	}
+
+	if h := conf.Heapster; h != nil {
+		hieraData.variables = append(hieraData.variables, fmt.Sprintf(`kubernetes_addons::heapster::enabled: %t`, conf.Heapster.Enabled))
+	}
+
+	if i := conf.Heapster; i != nil {
+		hieraData.variables = append(hieraData.variables, fmt.Sprintf(`kubernetes_addons::influxdb::enabled: %t`, conf.InfluxDB.Enabled))
+	}
+
 	return
 }
 

diff --git a/pkg/tarmak/initialize/initialize.go b/pkg/tarmak/initialize/initialize.go
@@ -286,6 +286,22 @@ creationLoop:
 			return nil, err
 		}
 
+		if clusterConf.Kubernetes == nil {
+			clusterConf.Kubernetes = new(clusterv1alpha1.ClusterKubernetes)
+		}
+
+		clusterConf.Kubernetes.Heapster = &clusterv1alpha1.ClusterKubernetesHeapster{
+			Enabled: false,
+		}
+
+		clusterConf.Kubernetes.Grafana = &clusterv1alpha1.ClusterKubernetesGrafana{
+			Enabled: false,
+		}
+
+		clusterConf.Kubernetes.InfluxDB = &clusterv1alpha1.ClusterKubernetesInfluxDB{
+			Enabled: false,
+		}
+
 		clusterObj, err = i.newCluster(clusterConf)
 		if err != nil {
 			return nil, err

diff --git a/puppet/hieradata/role/master.yaml b/puppet/hieradata/role/master.yaml
@@ -3,8 +3,8 @@ classes:
 - tarmak::master
 - tarmak::worker
 - tarmak::overlay_calico
-- kubernetes_addons::heapster
 - kubernetes_addons::metrics_server
+- kubernetes_addons::heapster
 - kubernetes_addons::influxdb
 - kubernetes_addons::grafana
 

diff --git a/puppet/modules/kubernetes_addons/manifests/grafana.pp b/puppet/modules/kubernetes_addons/manifests/grafana.pp
@@ -1,13 +1,18 @@
 class kubernetes_addons::grafana(
   $image=$::kubernetes_addons::params::grafana_image,
   $version=$::kubernetes_addons::params::grafana_version,
+  $enabled = true,
 ) inherits ::kubernetes_addons::params {
   require ::kubernetes
 
-  kubernetes::apply{'heapster-grafana':
-    manifests => [
-      template('kubernetes_addons/grafana-svc.yaml.erb'),
-      template('kubernetes_addons/grafana-deployment.yaml.erb'),
-    ],
+  if $enabled {
+    kubernetes::apply{'heapster-grafana':
+      manifests => [
+        template('kubernetes_addons/grafana-svc.yaml.erb'),
+        template('kubernetes_addons/grafana-deployment.yaml.erb'),
+      ],
+    }
+  } else {
+    kubernetes::delete{'heapster-grafana':}
   }
 }
diff --git a/puppet/modules/kubernetes_addons/manifests/heapster.pp b/puppet/modules/kubernetes_addons/manifests/heapster.pp
@@ -11,6 +11,7 @@
   $nanny_request_mem=$::kubernetes_addons::params::heapster_nanny_request_mem,
   $nanny_limit_cpu=$::kubernetes_addons::params::heapster_nanny_limit_cpu,
   $nanny_limit_mem=$::kubernetes_addons::params::heapster_nanny_limit_mem,
+  $enabled = true,
   $sink=undef,
 ) inherits ::kubernetes_addons::params {
   require ::kubernetes
@@ -40,11 +41,15 @@
     $version_before_1_9 = true
   }
 
-  kubernetes::apply{'heapster':
-    manifests => [
-      template('kubernetes_addons/heapster-svc.yaml.erb'),
-      template('kubernetes_addons/heapster-deployment.yaml.erb'),
-      template('kubernetes_addons/heapster-rbac.yaml.erb'),
-    ],
+  if $enabled {
+    kubernetes::apply{'heapster':
+      manifests => [
+        template('kubernetes_addons/heapster-svc.yaml.erb'),
+        template('kubernetes_addons/heapster-deployment.yaml.erb'),
+        template('kubernetes_addons/heapster-rbac.yaml.erb'),
+      ],
+    }
+  } else {
+    kubernetes::delete{'heapster':}
   }
 }
diff --git a/puppet/modules/kubernetes_addons/manifests/influxdb.pp b/puppet/modules/kubernetes_addons/manifests/influxdb.pp
@@ -1,13 +1,18 @@
 class kubernetes_addons::influxdb(
   $image=$::kubernetes_addons::params::influxdb_image,
   $version=$::kubernetes_addons::params::influxdb_version,
+  $enabled = true,
 ) inherits ::kubernetes_addons::params {
   require ::kubernetes
 
-  kubernetes::apply{'heapster-influxdb':
-    manifests => [
-      template('kubernetes_addons/influxdb-svc.yaml.erb'),
-      template('kubernetes_addons/influxdb-deployment.yaml.erb'),
-    ],
+  if $enabled {
+    kubernetes::apply{'heapster-influxdb':
+      manifests => [
+        template('kubernetes_addons/influxdb-svc.yaml.erb'),
+        template('kubernetes_addons/influxdb-deployment.yaml.erb'),
+      ],
+    }
+  } else {
+    kubernetes::delete{'heapster-influxdb':}
   }
 }