add dns discovery method for query-scheduler address

Signed-off-by: nschad <niclas.schad@gmail.com>
cortexproject · Mar 15, 2022 · 91f9a9f · 91f9a9f
1 parent f5b4a98
commit 91f9a9f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,9 @@
 ## master / unreleased
 
 * [ENHANCEMENT] Allow StoreGateway podManagementPolicy to be changed #332
-* [BUGFIX] Correct a typo in enabling distribtuor HPA #334
 * [FEATURE] Add Query-Scheduler #268
+* [BUGFIX] Correct a typo in enabling distributor HPA #334
+* [BUGFIX] Add service discovery method for query-scheduler addresses #338
 
 ## 1.4.0 / 2022-03-08
 

diff --git a/ci/test-deployment-values.yaml b/ci/test-deployment-values.yaml
@@ -48,12 +48,6 @@ config:
     join_members:
       - '{{ include "cortex.fullname" $ }}-memberlist'
 
-  frontend:
-    scheduler_address: 'dns+{{ include "cortex.querySchedulerFullname" $ }}-headless:9095'
-
-  frontend_worker:
-    scheduler_address: 'dns+{{ include "cortex.querySchedulerFullname" $ }}-headless:9095'
-
 ingester:
   replicas: 1
   autoscaling:

diff --git a/templates/querier/querier-dep.yaml b/templates/querier/querier-dep.yaml
@@ -53,9 +53,10 @@ spec:
             - "-target=querier"
             - "-config.file=/etc/cortex/cortex.yaml"
           {{- if .Values.query_scheduler.enabled }}
-            - "-querier.scheduler-address={{ template "cortex.fullname" . }}-query-scheduler-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
-          {{- else }}
-            - "-querier.frontend-address={{ template "cortex.fullname" . }}-query-frontend-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
+            - "-querier.scheduler-address=dns+{{ template "cortex.querySchedulerFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
+          {{- end }}
+          {{- if and .Values.query_frontend.enabled (not .Values.query_scheduler.enabled) }}
+            - "-querier.frontend-address=dns+{{ template "cortex.queryFrontendFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
           {{- end }}
           {{- include "cortex.memcached" . | nindent 12}}
           {{- range $key, $value := .Values.querier.extraArgs }}

diff --git a/templates/query-frontend/query-frontend-dep.yaml b/templates/query-frontend/query-frontend-dep.yaml
@@ -52,7 +52,7 @@ spec:
             - "-config.file=/etc/cortex/cortex.yaml"
             {{- include "cortex.frontend-memcached" . | nindent 12 }}
           {{- if .Values.query_scheduler.enabled }}
-            - "-frontend.scheduler-address={{ template "cortex.fullname" . }}-query-scheduler-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
+            - "-frontend.scheduler-address=dns+{{ template "cortex.querySchedulerFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
           {{- end }}
           {{- range $key, $value := .Values.query_frontend.extraArgs }}
             - "-{{ $key }}={{ $value }}"
@@ -109,4 +109,4 @@ spec:
         {{- if .Values.query_frontend.extraVolumes }}
         {{- toYaml .Values.query_frontend.extraVolumes | nindent 8}}
         {{- end }}
-{{- end -}}
+{{- end -}}