Skip to content

Commit ad2f5cf

Browse files
Ziulnschad
Ziul
and
nschad
authored
Enabled flags (#319)
* include enabled flag for distributor Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * include enabled flag for ingester Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * include enabled flag for querier Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * include enabled flag for querier-frontend Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * include enabled flag for store-gateway Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * update README.md with the flags Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * improve hpa check Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * updates CHANGELOG Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * Update CHANGELOG.md Co-authored-by: Niclas Schad <niclas.schad@gmail.com> Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com> * move CHANGELOG entry into correct section Signed-off-by: nschad <niclas.schad@gmail.com> Co-authored-by: Niclas Schad <niclas.schad@gmail.com>
1 parent 9bbf981 commit ad2f5cf

31 files changed

+50
-18
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## master / unreleased
44

5+
* [ENHANCEMENT] Includes enable flags for each component #319
6+
57
## 1.3.0 / 2022-02-10
68

79
* [CHANGE] move from quay.io/kiwigrid/k8s-sidecar to omegavvweapon/kopf-k8s-sidecar image #302

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ Kubernetes: `^1.19.0-0`
320320
| distributor.&ZeroWidthSpace;autoscaling.&ZeroWidthSpace;targetMemoryUtilizationPercentage | int | `0` | |
321321
| distributor.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` | |
322322
| distributor.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` | |
323+
| distributor.&ZeroWidthSpace;enabled | bool | `true` | |
323324
| distributor.&ZeroWidthSpace;env | list | `[]` | |
324325
| distributor.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
325326
| distributor.&ZeroWidthSpace;extraContainers | list | `[]` | |
@@ -377,6 +378,7 @@ Kubernetes: `^1.19.0-0`
377378
| ingester.&ZeroWidthSpace;autoscaling.&ZeroWidthSpace;targetMemoryUtilizationPercentage | int | `80` | |
378379
| ingester.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` | |
379380
| ingester.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` | |
381+
| ingester.&ZeroWidthSpace;enabled | bool | `true` | |
380382
| ingester.&ZeroWidthSpace;env | list | `[]` | |
381383
| ingester.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
382384
| ingester.&ZeroWidthSpace;extraContainers | list | `[]` | |
@@ -538,6 +540,7 @@ Kubernetes: `^1.19.0-0`
538540
| querier.&ZeroWidthSpace;autoscaling.&ZeroWidthSpace;targetMemoryUtilizationPercentage | int | `0` | |
539541
| querier.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` | |
540542
| querier.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` | |
543+
| querier.&ZeroWidthSpace;enabled | bool | `true` | |
541544
| querier.&ZeroWidthSpace;env | list | `[]` | |
542545
| querier.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
543546
| querier.&ZeroWidthSpace;extraContainers | list | `[]` | |
@@ -582,6 +585,7 @@ Kubernetes: `^1.19.0-0`
582585
| query_frontend.&ZeroWidthSpace;annotations | object | `{}` | |
583586
| query_frontend.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` | |
584587
| query_frontend.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` | |
588+
| query_frontend.&ZeroWidthSpace;enabled | bool | `true` | |
585589
| query_frontend.&ZeroWidthSpace;env | list | `[]` | |
586590
| query_frontend.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
587591
| query_frontend.&ZeroWidthSpace;extraContainers | list | `[]` | |
@@ -691,6 +695,7 @@ Kubernetes: `^1.19.0-0`
691695
| store_gateway.&ZeroWidthSpace;annotations | object | `{}` | |
692696
| store_gateway.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;enabled | bool | `true` | |
693697
| store_gateway.&ZeroWidthSpace;containerSecurityContext.&ZeroWidthSpace;readOnlyRootFilesystem | bool | `true` | |
698+
| store_gateway.&ZeroWidthSpace;enabled | bool | `true` | |
694699
| store_gateway.&ZeroWidthSpace;env | list | `[]` | |
695700
| store_gateway.&ZeroWidthSpace;extraArgs | object | `{}` | Additional Cortex container arguments, e.g. log.level (debug, info, warn, error) |
696701
| store_gateway.&ZeroWidthSpace;extraContainers | list | `[]` | |

‎templates/distributor/distributor-dep.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.distributor.enabled -}}
12
apiVersion: apps/v1
23
kind: Deployment
34
metadata:
@@ -116,3 +117,4 @@ spec:
116117
{{- if .Values.distributor.extraVolumes }}
117118
{{- toYaml .Values.distributor.extraVolumes | nindent 8}}
118119
{{- end }}
120+
{{- end }}

‎templates/distributor/distributor-hpa.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
{{- if and .Values.distributor.enable .Values.distributor.autoscaling.enabled }}
12
{{- with .Values.distributor.autoscaling -}}
2-
{{- if .enabled }}
33
apiVersion: autoscaling/v2beta2
44
kind: HorizontalPodAutoscaler
55
metadata:

‎templates/distributor/distributor-poddisruptionbudget.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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) }}
22
apiVersion: {{ include "cortex.pdbVersion" . }}
33
kind: PodDisruptionBudget
44
metadata:

‎templates/distributor/distributor-servicemonitor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.distributor.serviceMonitor.enabled }}
1+
{{- if and .Values.distributor.serviceMonitor.enabled .Values.distributor.enabled }}
22
apiVersion: monitoring.coreos.com/v1
33
kind: ServiceMonitor
44
metadata:

‎templates/distributor/distributor-svc-headless.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.distributor.enabled -}}
12
apiVersion: v1
23
kind: Service
34
metadata:
@@ -21,3 +22,4 @@ spec:
2122
targetPort: grpc
2223
selector:
2324
{{- include "cortex.distributorSelectorLabels" . | nindent 4 }}
25+
{{- end }}

‎templates/distributor/distributor-svc.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.distributor.enabled -}}
12
apiVersion: v1
23
kind: Service
34
metadata:
@@ -19,3 +20,4 @@ spec:
1920
targetPort: http-metrics
2021
selector:
2122
{{- include "cortex.distributorSelectorLabels" . | nindent 4 }}
23+
{{- end }}

‎templates/ingester/ingester-dep.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if not .Values.ingester.statefulSet.enabled -}}
1+
{{- if and (not .Values.ingester.statefulSet.enabled) .Values.ingester.enabled -}}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:

‎templates/ingester/ingester-hpa.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
{{- if and .Values.ingester.enabled .Values.ingester.autoscaling.enabled -}}
12
{{- with .Values.ingester.autoscaling -}}
2-
{{- if .enabled }}
33
apiVersion: autoscaling/v2beta2
44
kind: HorizontalPodAutoscaler
55
metadata:

0 commit comments

Comments
 (0)