From fa71733208e8da11b14cd7707b19aa565a20f6a6 Mon Sep 17 00:00:00 2001
From: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Date: Wed, 26 Jan 2022 13:54:56 +0100
Subject: [PATCH] Use server_http_port to set `-server.http-listen-port` flag

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
---
 .../test-disable-chunk-streaming-generated.yaml          | 9 +++++++++
 .../mimir-tests/test-query-sharding-generated.yaml       | 9 +++++++++
 operations/mimir-tests/test-storage-azure-generated.yaml | 9 +++++++++
 operations/mimir-tests/test-storage-gcs-generated.yaml   | 9 +++++++++
 operations/mimir-tests/test-storage-s3-generated.yaml    | 9 +++++++++
 operations/mimir/alertmanager.libsonnet                  | 1 +
 operations/mimir/compactor.libsonnet                     | 2 ++
 operations/mimir/distributor.libsonnet                   | 1 +
 operations/mimir/ingester.libsonnet                      | 2 ++
 operations/mimir/overrides-exporter.libsonnet            | 2 ++
 operations/mimir/querier.libsonnet                       | 2 ++
 operations/mimir/query-frontend.libsonnet                | 2 ++
 operations/mimir/query-scheduler.libsonnet               | 1 +
 operations/mimir/ruler.libsonnet                         | 2 ++
 operations/mimir/store-gateway.libsonnet                 | 3 +++
 15 files changed, 63 insertions(+)

diff --git a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml
index b929c4d49e0..aaf15530134 100644
--- a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml
+++ b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml
@@ -760,6 +760,7 @@ spec:
         - -server.grpc.keepalive.max-connection-idle=1m
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=distributor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -848,6 +849,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
@@ -931,6 +933,7 @@ spec:
         - -server.grpc-max-recv-msg-size-bytes=104857600
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store.max-query-length=12000h
         - -target=query-frontend
@@ -996,6 +999,7 @@ spec:
         - -query-scheduler.max-outstanding-requests-per-tenant=100
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=query-scheduler
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1090,6 +1094,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
@@ -1160,6 +1165,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=alertmanager
         env:
         - name: POD_IP
@@ -1252,6 +1258,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1352,6 +1359,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1672,6 +1680,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
diff --git a/operations/mimir-tests/test-query-sharding-generated.yaml b/operations/mimir-tests/test-query-sharding-generated.yaml
index 71863ae96f0..cfdd56fea2b 100644
--- a/operations/mimir-tests/test-query-sharding-generated.yaml
+++ b/operations/mimir-tests/test-query-sharding-generated.yaml
@@ -759,6 +759,7 @@ spec:
         - -server.grpc.keepalive.max-connection-idle=1m
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=distributor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -847,6 +848,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
@@ -934,6 +936,7 @@ spec:
         - -server.grpc-max-recv-msg-size-bytes=419430400
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store.max-query-length=12000h
         - -target=query-frontend
@@ -999,6 +1002,7 @@ spec:
         - -query-scheduler.max-outstanding-requests-per-tenant=800
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=query-scheduler
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1093,6 +1097,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
@@ -1163,6 +1168,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=alertmanager
         env:
         - name: POD_IP
@@ -1255,6 +1261,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1355,6 +1362,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1675,6 +1683,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
diff --git a/operations/mimir-tests/test-storage-azure-generated.yaml b/operations/mimir-tests/test-storage-azure-generated.yaml
index e050de2b125..a8613b230fd 100644
--- a/operations/mimir-tests/test-storage-azure-generated.yaml
+++ b/operations/mimir-tests/test-storage-azure-generated.yaml
@@ -759,6 +759,7 @@ spec:
         - -server.grpc.keepalive.max-connection-idle=1m
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=distributor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -849,6 +850,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
@@ -932,6 +934,7 @@ spec:
         - -server.grpc-max-recv-msg-size-bytes=104857600
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store.max-query-length=12000h
         - -target=query-frontend
@@ -997,6 +1000,7 @@ spec:
         - -query-scheduler.max-outstanding-requests-per-tenant=100
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=query-scheduler
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1095,6 +1099,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
@@ -1167,6 +1172,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=alertmanager
         env:
         - name: POD_IP
@@ -1261,6 +1267,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1363,6 +1370,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1685,6 +1693,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
diff --git a/operations/mimir-tests/test-storage-gcs-generated.yaml b/operations/mimir-tests/test-storage-gcs-generated.yaml
index 82f5d2f4252..646fd58b382 100644
--- a/operations/mimir-tests/test-storage-gcs-generated.yaml
+++ b/operations/mimir-tests/test-storage-gcs-generated.yaml
@@ -759,6 +759,7 @@ spec:
         - -server.grpc.keepalive.max-connection-idle=1m
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=distributor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -847,6 +848,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
@@ -930,6 +932,7 @@ spec:
         - -server.grpc-max-recv-msg-size-bytes=104857600
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store.max-query-length=12000h
         - -target=query-frontend
@@ -995,6 +998,7 @@ spec:
         - -query-scheduler.max-outstanding-requests-per-tenant=100
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=query-scheduler
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1089,6 +1093,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
@@ -1159,6 +1164,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=alertmanager
         env:
         - name: POD_IP
@@ -1251,6 +1257,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1351,6 +1358,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1671,6 +1679,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
diff --git a/operations/mimir-tests/test-storage-s3-generated.yaml b/operations/mimir-tests/test-storage-s3-generated.yaml
index 6603779fa10..f8053cbd851 100644
--- a/operations/mimir-tests/test-storage-s3-generated.yaml
+++ b/operations/mimir-tests/test-storage-s3-generated.yaml
@@ -759,6 +759,7 @@ spec:
         - -server.grpc.keepalive.max-connection-idle=1m
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=distributor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -848,6 +849,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
@@ -931,6 +933,7 @@ spec:
         - -server.grpc-max-recv-msg-size-bytes=104857600
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -server.http-write-timeout=1m
         - -store.max-query-length=12000h
         - -target=query-frontend
@@ -996,6 +999,7 @@ spec:
         - -query-scheduler.max-outstanding-requests-per-tenant=100
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=query-scheduler
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1093,6 +1097,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
@@ -1164,6 +1169,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=alertmanager
         env:
         - name: POD_IP
@@ -1257,6 +1263,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1358,6 +1365,7 @@ spec:
         - -server.grpc-max-send-msg-size-bytes=10485760
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1679,6 +1687,7 @@ spec:
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
+        - -server.http-listen-port=8080
         - -store-gateway.sharding-enabled=true
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
diff --git a/operations/mimir/alertmanager.libsonnet b/operations/mimir/alertmanager.libsonnet
index 1bc78ff5e07..070a4e46be5 100644
--- a/operations/mimir/alertmanager.libsonnet
+++ b/operations/mimir/alertmanager.libsonnet
@@ -70,6 +70,7 @@
       'experimental.alertmanager.enable-api': 'true',
       'alertmanager.storage.path': '/data',
       'alertmanager.web.external-url': '%s/alertmanager' % $._config.external_url,
+      'server.http-listen-port': $._config.server_http_port,
     } +
     (if hasFallbackConfig then {
        'alertmanager.configs.fallback': '/configs/alertmanager_fallback_config.yaml',
diff --git a/operations/mimir/compactor.libsonnet b/operations/mimir/compactor.libsonnet
index b3e76a7ed4c..ad5ca5a49dc 100644
--- a/operations/mimir/compactor.libsonnet
+++ b/operations/mimir/compactor.libsonnet
@@ -12,6 +12,8 @@
     {
       target: 'compactor',
 
+      'server.http-listen-port': $._config.server_http_port,
+
       // Compactor config.
       'compactor.block-ranges': '2h,12h,24h',
       'compactor.data-dir': '/data',
diff --git a/operations/mimir/distributor.libsonnet b/operations/mimir/distributor.libsonnet
index 341e3ac14f2..a85d2d1ff1f 100644
--- a/operations/mimir/distributor.libsonnet
+++ b/operations/mimir/distributor.libsonnet
@@ -24,6 +24,7 @@
       // around 1.25G, reducing the 99%ile.
       'mem-ballast-size-bytes': 1 << 30,  // 1GB
 
+      'server.http-listen-port': $._config.server_http_port,
       'server.grpc.keepalive.max-connection-age': '2m',
       'server.grpc.keepalive.max-connection-age-grace': '5m',
       'server.grpc.keepalive.max-connection-idle': '1m',
diff --git a/operations/mimir/ingester.libsonnet b/operations/mimir/ingester.libsonnet
index 007a54b73b6..441403f9a61 100644
--- a/operations/mimir/ingester.libsonnet
+++ b/operations/mimir/ingester.libsonnet
@@ -15,6 +15,8 @@
     {
       target: 'ingester',
 
+      'server.http-listen-port': $._config.server_http_port,
+
       // Ring config.
       'ingester.num-tokens': 512,
       'ingester.join-after': '0s',
diff --git a/operations/mimir/overrides-exporter.libsonnet b/operations/mimir/overrides-exporter.libsonnet
index 2466af2250a..758f27f30f2 100644
--- a/operations/mimir/overrides-exporter.libsonnet
+++ b/operations/mimir/overrides-exporter.libsonnet
@@ -24,6 +24,8 @@
   overrides_exporter_args:: {
     target: 'overrides-exporter',
 
+    'server.http-listen-port': $._config.server_http_port,
+
     'runtime-config.file': '%s/overrides.yaml' % $._config.overrides_configmap_mountpoint,
   } + $._config.limitsConfig,
 
diff --git a/operations/mimir/querier.libsonnet b/operations/mimir/querier.libsonnet
index 2ffd6bf2e57..e4eb96079cc 100644
--- a/operations/mimir/querier.libsonnet
+++ b/operations/mimir/querier.libsonnet
@@ -15,6 +15,8 @@
     {
       target: 'querier',
 
+      'server.http-listen-port': $._config.server_http_port,
+
       // Increase HTTP server response write timeout, as we were seeing some
       // queries that return a lot of data timeing out.
       'server.http-write-timeout': '1m',
diff --git a/operations/mimir/query-frontend.libsonnet b/operations/mimir/query-frontend.libsonnet
index 5a56b2d7944..05261d7b45b 100644
--- a/operations/mimir/query-frontend.libsonnet
+++ b/operations/mimir/query-frontend.libsonnet
@@ -9,6 +9,8 @@
       // Need log.level=debug so all queries are logged, needed for analyse.py.
       'log.level': 'debug',
 
+      'server.http-listen-port': $._config.server_http_port,
+
       // Increase HTTP server response write timeout, as we were seeing some
       // queries that return a lot of data timeing out.
       'server.http-write-timeout': '1m',
diff --git a/operations/mimir/query-scheduler.libsonnet b/operations/mimir/query-scheduler.libsonnet
index 5b786cb7844..d2401a2176b 100644
--- a/operations/mimir/query-scheduler.libsonnet
+++ b/operations/mimir/query-scheduler.libsonnet
@@ -10,6 +10,7 @@
     {
       target: 'query-scheduler',
       'log.level': 'debug',
+      'server.http-listen-port': $._config.server_http_port,
       'query-scheduler.max-outstanding-requests-per-tenant': 100,
     },
 
diff --git a/operations/mimir/ruler.libsonnet b/operations/mimir/ruler.libsonnet
index 9e7e53046b2..438700965ea 100644
--- a/operations/mimir/ruler.libsonnet
+++ b/operations/mimir/ruler.libsonnet
@@ -29,6 +29,8 @@
       'server.grpc-max-send-msg-size-bytes': 10 * 1024 * 1024,
       'server.grpc-max-recv-msg-size-bytes': 10 * 1024 * 1024,
 
+      'server.http-listen-port': $._config.server_http_port,
+
       // Do not extend the replication set on unhealthy (or LEAVING) ingester when "unregister on shutdown"
       // is set to false.
       'distributor.extend-writes': $._config.unregister_ingesters_on_shutdown,
diff --git a/operations/mimir/store-gateway.libsonnet b/operations/mimir/store-gateway.libsonnet
index 200d861a3c0..fa0b9979381 100644
--- a/operations/mimir/store-gateway.libsonnet
+++ b/operations/mimir/store-gateway.libsonnet
@@ -20,6 +20,9 @@
     $._config.queryBlocksStorageConfig +
     {
       target: 'store-gateway',
+
+      'server.http-listen-port': $._config.server_http_port,
+
       'runtime-config.file': '%s/overrides.yaml' % $._config.overrides_configmap_mountpoint,
 
       // Persist ring tokens so that when the store-gateway will be restarted