Skip to content

helm: Support revisionhistorylimit #12323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions operations/helm/charts/mimir-distributed/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Entries should include a reference to the Pull Request that introduced the chang
* [CHANGE] Query-scheduler: The query-scheduler is now a required component that is always used by queriers and query-frontends. #12188
* [ENHANCEMENT] Gateway ingress: Support labels for gateway ingress. #11964
* [ENHANCEMENT] Store-gateway: Configure options for emptyDir. #11951
* [ENHANCEMENT] Add support for `revisionhistorylimit` for all deployments. #12323

## 5.8.0-rc.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
replicas: {{ .Values.admin_api.replicas }}
revisionHistoryLimit: {{ .Values.admin_api.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "admin-api" "memberlist" true) | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
replicas: {{ .Values.alertmanager.replicas }}
revisionHistoryLimit: {{ .Values.alertmanager.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "alertmanager" "memberlist" true) | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
replicas: {{ .Values.continuous_test.replicas }}
revisionHistoryLimit: {{ .Values.continuous_test.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "continuous-test") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
replicas: {{ .Values.distributor.replicas }}
{{- end }}
{{- end }}
revisionHistoryLimit: {{ .Values.distributor.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "distributor" "memberlist" true) | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
replicas: {{ .Values.federation_frontend.replicas }}
revisionHistoryLimit: {{ .Values.federation_frontend.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "federation-frontend") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
{{- if not .autoscaling.enabled }}
replicas: {{ .replicas }}
{{- end }}
revisionHistoryLimit: {{ .revisionHistoryLimit }}
{{- if not $isGEMGateway }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" $ "component" "gateway") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
replicas: {{ .Values.graphite.querier.replicas }}
revisionHistoryLimit: {{ .Values.graphite.querier.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "graphite-querier") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
replicas: {{ .Values.graphite.write_proxy.replicas }}
revisionHistoryLimit: {{ .Values.graphite.write_proxy.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "graphite-write-proxy") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spec:
{{- if not .Values.nginx.autoscaling.enabled }}
replicas: {{ .Values.nginx.replicas }}
{{- end }}
revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }}
{{- end }}
{{- with .Values.nginx.deploymentStrategy }}
strategy:
{{ toYaml . | trim | indent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
replicas: {{ .Values.overrides_exporter.replicas }}
revisionHistoryLimit: {{ .Values.overrides_exporter.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "overrides-exporter") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
replicas: {{ .Values.querier.replicas }}
{{- end }}
{{- end }}
revisionHistoryLimit: {{ .Values.querier.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "querier" "memberlist" true) | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
replicas: {{ .Values.query_frontend.replicas }}
{{- end }}
{{- end }}
revisionHistoryLimit: {{ .Values.query_frontend.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "query-frontend") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
{{- toYaml .Values.query_scheduler.annotations | nindent 4 }}
spec:
replicas: {{ .Values.query_scheduler.replicas }}
revisionHistoryLimit: {{ .Values.query_scheduler.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "query-scheduler") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
replicas: {{ .Values.ruler_querier.replicas }}
{{- end }}
{{- end }}
revisionHistoryLimit: {{ .Values.ruler_querier.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler-querier" "memberlist" true) | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
replicas: {{ .Values.ruler_query_frontend.replicas }}
{{- end }}
{{- end }}
revisionHistoryLimit: {{ .Values.ruler_query_frontend.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler-query-frontend") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
{{- toYaml .Values.ruler_query_scheduler.annotations | nindent 4 }}
spec:
replicas: {{ .Values.ruler_query_scheduler.replicas }}
revisionHistoryLimit: {{ .Values.ruler_query_scheduler.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler-query-scheduler") | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ spec:
{{- if or (not .Values.ruler.kedaAutoscaling.enabled) (.Values.ruler.kedaAutoscaling.preserveReplicas) }}
replicas: {{ .Values.ruler.replicas }}
{{- end }}
revisionHistoryLimit: {{ .Values.ruler.revisionHistoryLimit }}
selector:
matchLabels:
{{- include "mimir.selectorLabels" (dict "ctx" . "component" "ruler" "memberlist" true) | nindent 6 }}
Expand Down
17 changes: 17 additions & 0 deletions operations/helm/charts/mimir-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@ alertmanager:
# Otherwise each zone starts `ceil(replicas / number_of_zones)` number of pods.
# E.g. if 'replicas' is set to 4 and there are 3 zones, then 4/3=1.33 and after rounding up it means 2 pods per zone are started.
replicas: 1
revisionHistoryLimit: null

# -- Allows to override the container image of the alertmanager component.
# When set it takes precedence over what is defined in global "image" or "enterprise.image" sections.
Expand Down Expand Up @@ -870,6 +871,7 @@ distributor:

# Setting it to null will produce a deployment without replicas set, allowing you to use autoscaling with the deployment
replicas: 1
revisionHistoryLimit: null

# -- [Experimental] Configure autoscaling via KEDA (https://keda.sh). This requires having
# KEDA already installed in the Kubernetes cluster. The metrics for scaling are read
Expand Down Expand Up @@ -1249,6 +1251,7 @@ overrides_exporter:
# tag: 2.16.0

replicas: 1
revisionHistoryLimit: null

annotations: {}

Expand Down Expand Up @@ -1342,6 +1345,7 @@ ruler:
# tag: 2.16.0

replicas: 1
revisionHistoryLimit: null

# -- [Experimental] Configure autoscaling via KEDA (https://keda.sh). This requires having
# KEDA already installed in the Kubernetes cluster. The metrics for scaling are read
Expand Down Expand Up @@ -1471,6 +1475,7 @@ ruler_querier:
# tag: 2.16.0

replicas: 2
revisionHistoryLimit: null

# -- [Experimental] Configure autoscaling via KEDA (https://keda.sh). This requires having
# KEDA already installed in the Kubernetes cluster. The metrics for scaling are read
Expand Down Expand Up @@ -1593,6 +1598,7 @@ ruler_query_frontend:

# Setting it to null will produce a deployment without replicas set, allowing you to use autoscaling with the deployment
replicas: 1
revisionHistoryLimit: null

# -- [Experimental] Configure autoscaling via KEDA (https://keda.sh). This requires having
# KEDA already installed in the Kubernetes cluster. The metrics for scaling are read
Expand Down Expand Up @@ -1709,6 +1715,7 @@ ruler_query_scheduler:
# tag: 2.16.0

replicas: 2
revisionHistoryLimit: null

service:
annotations: {}
Expand Down Expand Up @@ -1801,6 +1808,7 @@ querier:
# tag: 2.16.0

replicas: 2
revisionHistoryLimit: null

# -- [Experimental] Configure autoscaling via KEDA (https://keda.sh). This requires having
# KEDA already installed in the Kubernetes cluster. The metrics for scaling are read
Expand Down Expand Up @@ -1936,6 +1944,7 @@ query_frontend:

# Setting it to null will produce a deployment without replicas set, allowing you to use autoscaling with the deployment
replicas: 1
revisionHistoryLimit: null

# -- [Experimental] Configure autoscaling via KEDA (https://keda.sh). This requires having
# KEDA already installed in the Kubernetes cluster. The metrics for scaling are read
Expand Down Expand Up @@ -2053,6 +2062,7 @@ query_scheduler:
# tag: 2.16.0

replicas: 2
revisionHistoryLimit: null

service:
annotations: {}
Expand Down Expand Up @@ -3057,6 +3067,7 @@ nginx:
enabled: true
# -- Number of replicas for nginx
replicas: 1
revisionHistoryLimit: null
# -- Enable logging of 2xx and 3xx HTTP requests
verboseLogging: true
autoscaling:
Expand Down Expand Up @@ -3453,6 +3464,7 @@ gateway:

# -- Number of replicas for the Deployment
replicas: 1
revisionHistoryLimit: null

# -- HorizontalPodAutoscaler
autoscaling:
Expand Down Expand Up @@ -4265,6 +4277,7 @@ admin_api:
# tag: 2.16.0

replicas: 1
revisionHistoryLimit: null

annotations: {}
service:
Expand Down Expand Up @@ -4431,6 +4444,7 @@ graphite:
querier:
# Setting it to null will produce a deployment without replicas set, allowing you to use autoscaling with the deployment
replicas: 2
revisionHistoryLimit: null

schemasConfiguration:
storageSchemas: |-
Expand Down Expand Up @@ -4522,6 +4536,7 @@ graphite:

write_proxy:
replicas: 2
revisionHistoryLimit: null

service:
annotations: {}
Expand Down Expand Up @@ -4748,6 +4763,7 @@ federation_frontend:

# -- Number of replicas for the federation-frontend
replicas: 2
revisionHistoryLimit: null
# -- Deployment strategy for the federation-frontend pods
strategy:
type: RollingUpdate
Expand Down Expand Up @@ -4864,6 +4880,7 @@ continuous_test:
# tag: 2.16.0
# -- Number of replicas to start of continuous test
replicas: 1
revisionHistoryLimit: null
# The image section has been removed as continuous test is now a module of the regular Mimir image.
# See settings for the image at the top image section.
# -- The endpoints to use for writing to and reading metrics from your instance.
Expand Down
Loading