Enabled flags (#319)

Ziul · nschad · web-flow · commit ad2f5cf3ce96 · 2022-02-23T20:58:09.000+01:00
* include enabled flag for distributor

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* include enabled flag for ingester

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* include enabled flag for querier

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* include enabled flag for querier-frontend

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* include enabled flag for store-gateway

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* update README.md with the flags

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* improve hpa check

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* updates CHANGELOG

Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* Update CHANGELOG.md

Co-authored-by: Niclas Schad &lt;niclas.schad@gmail.com&gt;
Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;

* move CHANGELOG entry into correct section

Signed-off-by: nschad &lt;niclas.schad@gmail.com&gt;

Co-authored-by: Niclas Schad &lt;niclas.schad@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master / unreleased
 
+* [ENHANCEMENT] Includes enable flags for each component #319
+
 ## 1.3.0 / 2022-02-10
 
 * [CHANGE] move from quay.io/kiwigrid/k8s-sidecar to omegavvweapon/kopf-k8s-sidecar image #302
diff --git a/README.md b/README.md
@@ -320,6 +320,7 @@ Kubernetes: `^1.19.0-0`
 | distributor.&ZeroWidthSpace;autoscaling.&ZeroWidthSpace;targetMemoryUtilizationPercentage | int | `0` |  |
 | distributor.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` |  |
 | distributor.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` |  |
+| distributor.&ZeroWidthSpace;enabled | bool | `true` |  |
 | distributor.&ZeroWidthSpace;env | list | `[]` |  |
 | distributor.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
 | distributor.&ZeroWidthSpace;extraContainers | list | `[]` |  |
@@ -377,6 +378,7 @@ Kubernetes: `^1.19.0-0`
 | ingester.&ZeroWidthSpace;autoscaling.&ZeroWidthSpace;targetMemoryUtilizationPercentage | int | `80` |  |
 | ingester.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` |  |
 | ingester.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` |  |
+| ingester.&ZeroWidthSpace;enabled | bool | `true` |  |
 | ingester.&ZeroWidthSpace;env | list | `[]` |  |
 | ingester.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
 | ingester.&ZeroWidthSpace;extraContainers | list | `[]` |  |
@@ -538,6 +540,7 @@ Kubernetes: `^1.19.0-0`
 | querier.&ZeroWidthSpace;autoscaling.&ZeroWidthSpace;targetMemoryUtilizationPercentage | int | `0` |  |
 | querier.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` |  |
 | querier.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` |  |
+| querier.&ZeroWidthSpace;enabled | bool | `true` |  |
 | querier.&ZeroWidthSpace;env | list | `[]` |  |
 | querier.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
 | querier.&ZeroWidthSpace;extraContainers | list | `[]` |  |
@@ -582,6 +585,7 @@ Kubernetes: `^1.19.0-0`
 | query_frontend.&ZeroWidthSpace;annotations | object | `{}` |  |
 | query_frontend.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` |  |
 | query_frontend.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` |  |
+| query_frontend.&ZeroWidthSpace;enabled | bool | `true` |  |
 | query_frontend.&ZeroWidthSpace;env | list | `[]` |  |
 | query_frontend.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
 | query_frontend.&ZeroWidthSpace;extraContainers | list | `[]` |  |
@@ -691,6 +695,7 @@ Kubernetes: `^1.19.0-0`
 | store_gateway.&ZeroWidthSpace;annotations | object | `{}` |  |
 | store_gateway.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` |  |
 | store_gateway.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` |  |
+| store_gateway.&ZeroWidthSpace;enabled | bool | `true` |  |
 | store_gateway.&ZeroWidthSpace;env | list | `[]` |  |
 | store_gateway.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
 | store_gateway.&ZeroWidthSpace;extraContainers | list | `[]` |  |
diff --git a/templates/distributor/distributor-dep.yaml b/templates/distributor/distributor-dep.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.distributor.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -116,3 +117,4 @@ spec:
         {{- if .Values.distributor.extraVolumes }}
         {{- toYaml .Values.distributor.extraVolumes | nindent 8}}
         {{- end }}
+{{- end }}
diff --git a/templates/distributor/distributor-hpa.yaml b/templates/distributor/distributor-hpa.yaml
@@ -1,5 +1,5 @@
+{{- if and .Values.distributor.enable .Values.distributor.autoscaling.enabled }}
 {{- with .Values.distributor.autoscaling -}}
-{{- if .enabled }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
diff --git a/templates/distributor/distributor-poddisruptionbudget.yaml b/templates/distributor/distributor-poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if and (gt (int .Values.distributor.replicas) 1) (.Values.distributor.podDisruptionBudget) }}
+{{- if and (gt (int .Values.distributor.replicas) 1) (.Values.distributor.podDisruptionBudget) (.Values.distributor.enabled) }}
 apiVersion: {{ include "cortex.pdbVersion" . }}
 kind: PodDisruptionBudget
 metadata:
diff --git a/templates/distributor/distributor-servicemonitor.yaml b/templates/distributor/distributor-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.distributor.serviceMonitor.enabled }}
+{{- if and .Values.distributor.serviceMonitor.enabled .Values.distributor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/templates/distributor/distributor-svc-headless.yaml b/templates/distributor/distributor-svc-headless.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.distributor.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -21,3 +22,4 @@ spec:
       targetPort: grpc
   selector:
     {{- include "cortex.distributorSelectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/templates/distributor/distributor-svc.yaml b/templates/distributor/distributor-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.distributor.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
       targetPort: http-metrics
   selector:
     {{- include "cortex.distributorSelectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/templates/ingester/ingester-dep.yaml b/templates/ingester/ingester-dep.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.ingester.statefulSet.enabled -}}
+{{- if and (not .Values.ingester.statefulSet.enabled) .Values.ingester.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/templates/ingester/ingester-hpa.yaml b/templates/ingester/ingester-hpa.yaml
@@ -1,5 +1,5 @@
+{{- if and .Values.ingester.enabled .Values.ingester.autoscaling.enabled -}}
 {{- with .Values.ingester.autoscaling -}}
-{{- if .enabled }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
diff --git a/templates/ingester/ingester-poddisruptionbudget.yaml b/templates/ingester/ingester-poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if and (gt (int .Values.ingester.replicas) 1) (.Values.ingester.podDisruptionBudget) }}
+{{- if and (gt (int .Values.ingester.replicas) 1) (.Values.ingester.podDisruptionBudget) (.Values.ingester.enabled) }}
 apiVersion: {{ include "cortex.pdbVersion" . }}
 kind: PodDisruptionBudget
 metadata:
diff --git a/templates/ingester/ingester-servicemonitor.yaml b/templates/ingester/ingester-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingester.serviceMonitor.enabled }}
+{{- if and .Values.ingester.serviceMonitor.enabled .Values.ingester.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/templates/ingester/ingester-statefulset.yaml b/templates/ingester/ingester-statefulset.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingester.statefulSet.enabled -}}
+{{- if and .Values.ingester.statefulSet.enabled .Values.ingester.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
diff --git a/templates/ingester/ingester-svc-headless.yaml b/templates/ingester/ingester-svc-headless.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ingester.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -20,3 +21,4 @@ spec:
       targetPort: grpc
   selector:
     {{- include "cortex.ingesterSelectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/templates/ingester/ingester-svc.yaml b/templates/ingester/ingester-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ingester.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
       targetPort: http-metrics
   selector:
     {{- include "cortex.ingesterSelectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/templates/querier/querier-dep.yaml b/templates/querier/querier-dep.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.querier.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -110,3 +111,4 @@ spec:
         {{- if .Values.querier.extraVolumes }}
         {{- toYaml .Values.querier.extraVolumes | nindent 8}}
         {{- end }}
+{{- end -}}
diff --git a/templates/querier/querier-hpa.yaml b/templates/querier/querier-hpa.yaml
@@ -1,5 +1,5 @@
+{{- if and .Values.querier.enabled .Values.querier.autoscaling.enabled -}}
 {{- with .Values.querier.autoscaling -}}
-{{- if .enabled }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
diff --git a/templates/querier/querier-poddisruptionbudget.yaml b/templates/querier/querier-poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if and (gt (int .Values.querier.replicas) 1) (.Values.querier.podDisruptionBudget) }}
+{{- if and (gt (int .Values.querier.replicas) 1) (.Values.querier.podDisruptionBudget) (.Values.querier.enabled) }}
 apiVersion: {{ include "cortex.pdbVersion" . }}
 kind: PodDisruptionBudget
 metadata:
diff --git a/templates/querier/querier-servicemonitor.yaml b/templates/querier/querier-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.querier.serviceMonitor.enabled }}
+{{- if and .Values.querier.serviceMonitor.enabled .Values.querier.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/templates/querier/querier-svc.yaml b/templates/querier/querier-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.querier.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
       targetPort: http-metrics
   selector:
     {{- include "cortex.querierSelectorLabels" . | nindent 4 }}
+{{- end -}}
diff --git a/templates/query-frontend/query-frontend-dep.yaml b/templates/query-frontend/query-frontend-dep.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.query_frontend.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -105,3 +106,4 @@ spec:
         {{- if .Values.query_frontend.extraVolumes }}
         {{- toYaml .Values.query_frontend.extraVolumes | nindent 8}}
         {{- end }}
+{{- end -}}
diff --git a/templates/query-frontend/query-frontend-servicemonitor.yaml b/templates/query-frontend/query-frontend-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.query_frontend.serviceMonitor.enabled }}
+{{- if and .Values.query_frontend.serviceMonitor.enabled .Values.query_frontend.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/templates/query-frontend/query-frontend-svc-headless.yaml b/templates/query-frontend/query-frontend-svc-headless.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.query_frontend.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -21,3 +22,4 @@ spec:
       targetPort: grpc
   selector:
     {{- include "cortex.queryFrontendSelectorLabels" . | nindent 4 }}
+{{- end -}}
diff --git a/templates/query-frontend/query-frontend-svc.yaml b/templates/query-frontend/query-frontend-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.query_frontend.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
       targetPort: http-metrics
   selector:
     {{- include "cortex.queryFrontendSelectorLabels" . | nindent 4 }}
+{{- end -}}
diff --git a/templates/query-frontend/query-poddisruptionbudget.yaml b/templates/query-frontend/query-poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if and (gt (int .Values.query_frontend.replicas) 1) (.Values.query_frontend.podDisruptionBudget) }}
+{{- if and (gt (int .Values.query_frontend.replicas) 1) (.Values.query_frontend.podDisruptionBudget) (.Values.query_frontend.enabled) }}
 apiVersion: {{ include "cortex.pdbVersion" . }}
 kind: PodDisruptionBudget
 metadata:
diff --git a/templates/store-gateway/store-gateway-poddisruptionbudget.yaml b/templates/store-gateway/store-gateway-poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if and (gt (int .Values.store_gateway.replicas) 1) (.Values.store_gateway.podDisruptionBudget) }}
+{{- if and (gt (int .Values.store_gateway.replicas) 1) (.Values.store_gateway.podDisruptionBudget) (.Values.store_gateway.enabled) }}
 apiVersion: {{ include "cortex.pdbVersion" . }}
 kind: PodDisruptionBudget
 metadata:
diff --git a/templates/store-gateway/store-gateway-servicemonitor.yaml b/templates/store-gateway/store-gateway-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.store_gateway.serviceMonitor.enabled }}
+{{- if and .Values.store_gateway.serviceMonitor.enabled .Values.store_gateway.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/templates/store-gateway/store-gateway-statefulset.yaml b/templates/store-gateway/store-gateway-statefulset.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.config.storage.engine "blocks" -}}
+{{- if and (eq .Values.config.storage.engine "blocks") (.Values.store_gateway.enabled) -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
diff --git a/templates/store-gateway/store-gateway-svc-headless.yaml b/templates/store-gateway/store-gateway-svc-headless.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.config.storage.engine "blocks" -}}
+{{- if and (eq .Values.config.storage.engine "blocks") .Values.store_gateway.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/templates/store-gateway/store-gateway-svc.yaml b/templates/store-gateway/store-gateway-svc.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.config.storage.engine "blocks" -}}
+{{- if and (eq .Values.config.storage.engine "blocks") (.Values.store_gateway.enabled) -}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/values.yaml b/values.yaml
@@ -326,6 +326,7 @@ alertmanager:
       readOnlyRootFilesystem: true
 
 distributor:
+  enabled: true
   replicas: 2
 
   service:
@@ -428,6 +429,7 @@ distributor:
   lifecycle: {}
 
 ingester:
+  enabled: true
   replicas: 3
 
   statefulSet:
@@ -704,6 +706,7 @@ ruler:
       readOnlyRootFilesystem: true
 
 querier:
+  enabled: true
   replicas: 2
 
   service:
@@ -806,6 +809,7 @@ querier:
   lifecycle: {}
 
 query_frontend:
+  enabled: true
   replicas: 2
 
   service:
@@ -1174,6 +1178,7 @@ nginx:
     behavior: {}
 
 store_gateway:
+  enabled: true
   replicas: 1
 
   service:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if and (gt (int .Values.distributor.replicas) 1) (.Values.distributor.podDisruptionBudget) }}`
	`1`	`+{{- if and (gt (int .Values.distributor.replicas) 1) (.Values.distributor.podDisruptionBudget) (.Values.distributor.enabled) }}`
`2`	`2`	`apiVersion: {{ include "cortex.pdbVersion" . }}`
`3`	`3`	`kind: PodDisruptionBudget`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.distributor.serviceMonitor.enabled }}`
	`1`	`+{{- if and .Values.distributor.serviceMonitor.enabled .Values.distributor.enabled }}`
`2`	`2`	`apiVersion: monitoring.coreos.com/v1`
`3`	`3`	`kind: ServiceMonitor`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if not .Values.ingester.statefulSet.enabled -}}`
	`1`	`+{{- if and (not .Values.ingester.statefulSet.enabled) .Values.ingester.enabled -}}`
`2`	`2`	`apiVersion: apps/v1`
`3`	`3`	`kind: Deployment`
`4`	`4`	`metadata:`