remove the 'enabled' variable from the compactor, index-gateway, quer…

…ier, query-scheduler, and ruler

Signed-off-by: Edward Welch <[email protected]>

production/helm/loki/templates/NOTES.txt

@@ -24,18 +24,10 @@ Installed components:
 * backend
 {{- end }}
 {{- else }}
-{{- if .Values.compactor.enabled }}
 * compactor
-{{- end }}
-{{- if .Values.indexGateway.enabled }}
 * index gateway
-{{- end }}
-{{- if .Values.queryScheduler.enabled }}
 * query scheduler
-{{- end }}
-{{- if .Values.ruler.enabled }}
 * ruler
-{{- end }}
 * distributor
 * ingester
 * querier

production/helm/loki/templates/compactor/service-compactor.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.compactor.enabled }}
+{{- if $isDistributed }}
 apiVersion: v1
 kind: Service
 metadata:

production/helm/loki/templates/compactor/statefulset-compactor.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.compactor.enabled }}
+{{- if $isDistributed }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:

production/helm/loki/templates/index-gateway/poddisruptionbudget-index-gateway.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.indexGateway.enabled (gt (int .Values.indexGateway.replicas) 1) }}
+{{- if and $isDistributed (gt (int .Values.indexGateway.replicas) 1) }}
 {{- if kindIs "invalid" .Values.indexGateway.maxUnavailable }}
 {{- fail "`.Values.indexGateway.maxUnavailable` must be set when `.Values.indexGateway.replicas` is greater than 1." }}
 {{- else }}

production/helm/loki/templates/index-gateway/service-index-gateway-headless.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.indexGateway.enabled }}
+{{- if $isDistributed }}
 apiVersion: v1
 kind: Service
 metadata:

production/helm/loki/templates/index-gateway/service-index-gateway.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.indexGateway.enabled }}
+{{- if $isDistributed }}
 apiVersion: v1
 kind: Service
 metadata:

production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.indexGateway.enabled }}
+{{- if $isDistributed }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:

production/helm/loki/templates/querier/deployment-querier.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.indexGateway.enabled }}
+{{- if $isDistributed }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

production/helm/loki/templates/querier/hpa.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.indexGateway.enabled .Values.querier.autoscaling.enabled }}
+{{- if and $isDistributed .Values.querier.autoscaling.enabled }}
 {{- $apiVersion := include "loki.hpa.apiVersion" . -}}
 apiVersion: {{ $apiVersion }}
 kind: HorizontalPodAutoscaler

production/helm/loki/templates/query-scheduler/deployment-query-scheduler.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.queryScheduler.enabled }}
+{{- if $isDistributed }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

production/helm/loki/templates/query-scheduler/poddisruptionbudget-query-scheduler.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.queryScheduler.enabled (gt (int .Values.queryScheduler.replicas) 1) }}
+{{- if and $isDistributed (gt (int .Values.queryScheduler.replicas) 1) }}
 {{- if kindIs "invalid" .Values.queryScheduler.maxUnavailable }}
 {{- fail "`.Values.queryScheduler.maxUnavailable` must be set when `.Values.queryScheduler.replicas` is greater than 1." }}
 {{- else }}

production/helm/loki/templates/query-scheduler/service-query-scheduler.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.queryScheduler.enabled }}
+{{- if $isDistributed }}
 apiVersion: v1
 kind: Service
 metadata:

production/helm/loki/templates/ruler/configmap-ruler.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.ruler.enabled }}
+{{- if $isDistributed }}
 {{- range $dir, $files := .Values.ruler.directories }}
 ---
 apiVersion: v1

production/helm/loki/templates/ruler/poddisruptionbudget-ruler.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.ruler.enabled (gt (int .Values.ruler.replicas) 1) }}
+{{- if and $isDistributed (gt (int .Values.ruler.replicas) 1) }}
 {{- if kindIs "invalid" .Values.ruler.maxUnavailable }}
 {{- fail "`.Values.ruler.maxUnavailable` must be set when `.Values.ruler.replicas` is greater than 1." }}
 {{- else }}

production/helm/loki/templates/ruler/service-ruler.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.ruler.enabled }}
+{{- if $isDistributed }}
 apiVersion: v1
 kind: Service
 metadata:

production/helm/loki/templates/ruler/statefulset-ruler.yaml

@@ -1,5 +1,5 @@
 {{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
-{{- if and $isDistributed .Values.ruler.enabled }}
+{{- if $isDistributed }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:

production/helm/loki/values.yaml

@@ -1899,8 +1899,6 @@ queryFrontend:
 
 # -- Configuration for the query-scheduler
 queryScheduler:
-  # -- Specifies whether the query-scheduler should be decoupled from the query-frontend
-  enabled: false
   # -- Number of replicas for the query-scheduler.
   # It should be lower than `-querier.max-concurrent` to avoid generating back-pressure in queriers;
   # it's also recommended that this value evenly divides the latter
@@ -1969,8 +1967,6 @@ queryScheduler:
 
 # -- Configuration for the index-gateway
 indexGateway:
-  # -- Specifies whether the index-gateway should be enabled
-  enabled: false
   # -- Number of replicas for the index-gateway
   replicas: 0
   # -- Whether the index gateway should join the memberlist hashring
@@ -2062,8 +2058,6 @@ indexGateway:
 compactor:
   # -- Number of replicas for the compactor
   replicas: 0
-  # -- Specifies whether compactor should be enabled
-  enabled: false
   # -- hostAliases to add
   hostAliases: []
   #  - ip: 1.2.3.4
@@ -2177,8 +2171,6 @@ compactor:
 
 # -- Configuration for the ruler
 ruler:
-  # -- Specifies whether the ruler should be enabled
-  enabled: false
   # -- Number of replicas for the ruler
   replicas: 0
   # -- hostAliases to add