fix service ports, fix ruler endpoint for configs and alertmanager (#55)

Signed-off-by: Roger Steneteg <[email protected]>

Author: rsteneteg

templates/configs-svc.yaml

@@ -16,7 +16,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.configs.service.port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics

templates/distributor-svc.yaml

@@ -16,7 +16,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.distributor.service.port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics

templates/ingester-svc.yaml

@@ -16,7 +16,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.ingester.service.port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics

templates/nginx-svc.yaml

@@ -17,7 +17,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.nginx.service.port }}
+    - port: {{ .Values.nginx.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics

templates/querier-svc.yaml

@@ -16,7 +16,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.querier.service.port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics

templates/query-frontend-svc-headless.yaml

@@ -8,11 +8,11 @@ metadata:
     chart: {{ template "cortex.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-    {{- with .Values.query_frontend.labels }}
+    {{- with .Values.query_frontend.service.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   annotations:
-    {{- toYaml .Values.query_frontend.annotations | nindent 4 }}
+    {{- toYaml .Values.query_frontend.service.annotations | nindent 4 }}
 spec:
   type: ClusterIP
   clusterIP: None
@@ -22,7 +22,7 @@ spec:
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics
-    - port: {{ .Values.query_frontend.service.grpc_port }}
+    - port: {{ .Values.config.server.grpc_listen_port }}
       protocol: TCP
       name: grpclb
       targetPort: grpc

templates/query-frontend-svc.yaml

@@ -16,13 +16,13 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.query_frontend.service.http_port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics
-    - port: {{ .Values.query_frontend.service.grpc_port }}
+    - port: {{ .Values.config.server.grpc_listen_port }}
       protocol: TCP
-      name: grpc
+      name: grpclb
       targetPort: grpc
   selector:
     app: {{ template "cortex.name" . }}-query-frontend

templates/ruler-dep.yaml

@@ -59,8 +59,8 @@ spec:
           args:
             - "-target=ruler"
             - "-config.file=/etc/cortex/cortex.yaml"
-            - "-ruler.configs.url=http://{{ template "cortex.name" . }}-configs"
-            - "-ruler.alertmanager-url=http://{{ template "cortex.name" . }}-alertmanager/api/prom/alertmanager/"
+            - "-ruler.configs.url=http://{{ template "cortex.fullname" . }}-configs.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.config.server.http_listen_port }}"
+            - "-ruler.alertmanager-url=http://{{ template "cortex.fullname" . }}-alertmanager.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.config.server.http_listen_port }}/api/prom/alertmanager/"
             {{- if .Values.memcached.enabled }}
             - -store.chunks-cache.memcached.addresses=dns+{{ template "cortex.fullname" . }}-memcached.{{ .Release.Namespace }}.svc.cluster.local:11211
             - -store.chunks-cache.memcached.timeout=100ms

templates/ruler-svc.yaml

@@ -16,7 +16,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.ruler.service.port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics

templates/store-gateway-svc.yaml

@@ -18,11 +18,11 @@ spec:
   type: ClusterIP
   clusterIP: None
   ports:
-    - port: {{ .Values.store_gateway.service.port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics
-    - port: {{ .Values.store_gateway.service.grpc_port }}
+    - port: {{ .Values.config.server.grpc_listen_port }}
       protocol: TCP
       name: grpclb
       targetPort: grpc      

templates/table-manager-svc.yaml

@@ -17,7 +17,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.table_manager.service.port }}
+    - port: {{ .Values.config.server.http_listen_port }}
       protocol: TCP
       name: http-metrics
       targetPort: http-metrics

values.yaml

@@ -314,7 +314,6 @@ distributor:
   replicas: 2
 
   service:
-    port: 80
     annotations: {}
     labels: {}
 
@@ -397,7 +396,6 @@ ingester:
     enabled: false
 
   service:
-    port: 80
     annotations: {}
     labels: {}
 
@@ -520,7 +518,6 @@ ruler:
   replicas: 1
 
   service:
-    port: 80
     annotations: {}
     labels: {}
 
@@ -585,7 +582,6 @@ querier:
   replicas: 2
 
   service:
-    port: 80
     annotations: {}
     labels: {}
 
@@ -662,8 +658,6 @@ query_frontend:
   replicas: 2
 
   service:
-    http_port: 80
-    grpc_port: 9095
     annotations: {}
     labels: {}
 
@@ -740,7 +734,6 @@ table_manager:
   replicas: 1
 
   service:
-    port: 80
     annotations: {}
     labels: {}
 
@@ -805,7 +798,6 @@ configs:
   replicas: 1
 
   service:
-    port: 80
     annotations: {}
     labels: {}
 
@@ -878,7 +870,6 @@ nginx:
     pullPolicy: IfNotPresent
 
   service:
-    port: 80
     annotations: {}
     labels: {}
 
@@ -943,8 +934,6 @@ store_gateway:
   replicas: 1
 
   service:
-    port: 80
-    grpc_port: 9095
     annotations: {}
     labels: {}
 
@@ -1058,7 +1047,6 @@ compactor:
   replicas: 1
 
   service:
-    port: 80
     annotations: {}
     labels: {}