Merge pull request #1083 from flanksource/disable-kube-state-metrics

fix: add flag to disable kube-state-metrics deployment
flanksource · Sep 5, 2023 · 9235ab0 · 9235ab0
2 parents 33d14a2 + 171f634
commit 9235ab0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/manifests/monitoring/kube-state-metrics.yaml b/manifests/monitoring/kube-state-metrics.yaml
@@ -273,4 +273,4 @@ spec:
   jobLabel: k8s-app
   selector:
     matchLabels:
-      k8s-app: kube-state-metrics
+      k8s-app: kube-state-metrics
diff --git a/pkg/phases/monitoring/monitoring.go b/pkg/phases/monitoring/monitoring.go
@@ -67,6 +67,15 @@ func Install(p *platform.Platform) error {
 		return nil
 	}
 
+	if p.Monitoring.DisableKubeStateMetrics {
+		for i, v := range specs {
+			if v == "kube-state-metrics.yaml" {
+				specs = append(specs[:i], specs[i+1:]...)
+				break
+			}
+		}
+	}
+
 	if p.Monitoring.Karma.Version == "" {
 		p.Monitoring.Karma.Version = "v0.63"
 	}

diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -506,20 +506,21 @@ func (dns DynamicDNS) IsEnabled() bool {
 }
 
 type Monitoring struct {
-	Disabled         Boolean       `yaml:"disabled,omitempty" json:"disabled,omitempty"`
-	AlertEmail       string        `yaml:"alert_email,omitempty" json:"alert_email,omitempty"`
-	Version          string        `yaml:"version,omitempty" json:"version,omitempty"`
-	Prometheus       Prometheus    `yaml:"prometheus,omitempty" json:"prometheus,omitempty"`
-	Karma            Karma         `yaml:"karma,omitempty" json:"karma,omitempty"`
-	Grafana          Grafana       `yaml:"grafana,omitempty" json:"grafana,omitempty"`
-	AlertManager     AlertManager  `yaml:"alertmanager,omitempty" json:"alertManager,omitempty"`
-	KubeStateMetrics string        `yaml:"kubeStateMetrics,omitempty" json:"kubeStateMetrics,omitempty"`
-	KubeRbacProxy    string        `yaml:"kubeRbacProxy,omitempty" json:"kubeRbacProxy,omitempty"`
-	NodeExporter     string        `yaml:"nodeExporter,omitempty" json:"nodeExporter,omitempty"`
-	AddonResizer     string        `yaml:"addonResizer,omitempty" json:"addonResizer,omitempty"`
-	ExcludeAlerts    []string      `yaml:"excludeAlerts,omitempty" json:"excludeAlerts,omitempty"`
-	PushGateway      PushGateway   `yaml:"pushGateway,omitempty" json:"pushGateway,omitempty"`
-	E2E              MonitoringE2E `yaml:"e2e,omitempty" json:"e2e,omitempty"`
+	Disabled                Boolean       `yaml:"disabled,omitempty" json:"disabled,omitempty"`
+	AlertEmail              string        `yaml:"alert_email,omitempty" json:"alert_email,omitempty"`
+	Version                 string        `yaml:"version,omitempty" json:"version,omitempty"`
+	Prometheus              Prometheus    `yaml:"prometheus,omitempty" json:"prometheus,omitempty"`
+	Karma                   Karma         `yaml:"karma,omitempty" json:"karma,omitempty"`
+	Grafana                 Grafana       `yaml:"grafana,omitempty" json:"grafana,omitempty"`
+	AlertManager            AlertManager  `yaml:"alertmanager,omitempty" json:"alertManager,omitempty"`
+	KubeStateMetrics        string        `yaml:"kubeStateMetrics,omitempty" json:"kubeStateMetrics,omitempty"`
+	DisableKubeStateMetrics Boolean       `yaml:"disableKubeStateMetrics,omitempty" json:"disableKubeStateMetrics,omitempty"`
+	KubeRbacProxy           string        `yaml:"kubeRbacProxy,omitempty" json:"kubeRbacProxy,omitempty"`
+	NodeExporter            string        `yaml:"nodeExporter,omitempty" json:"nodeExporter,omitempty"`
+	AddonResizer            string        `yaml:"addonResizer,omitempty" json:"addonResizer,omitempty"`
+	ExcludeAlerts           []string      `yaml:"excludeAlerts,omitempty" json:"excludeAlerts,omitempty"`
+	PushGateway             PushGateway   `yaml:"pushGateway,omitempty" json:"pushGateway,omitempty"`
+	E2E                     MonitoringE2E `yaml:"e2e,omitempty" json:"e2e,omitempty"`
 }
 
 func (m Monitoring) IsDisabled() bool {