jsonnet: pass downscale-http-port from config (#10367)

* mimir: pass downscale endpoint port from config Signed-off-by: Vladimir Varankin <[email protected]> * update changelog Signed-off-by: Vladimir Varankin <[email protected]> * rebuild assets Signed-off-by: Vladimir Varankin <[email protected]> --------- Signed-off-by: Vladimir Varankin <[email protected]>
grafana · Jan 30, 2025 · b26705d · b26705d
1 parent 656dfb1
commit b26705d
Show file tree

Hide file tree

Showing 24 changed files with 77 additions and 76 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@
 * [CHANGE] Memcached: Update to Memcached 1.6.34. #10318
 * [ENHANCEMENT] Enforce `persistentVolumeClaimRetentionPolicy` `Retain` policy on partition ingesters during migration to experimental ingest storage. #10395
 * [BUGFIX] Ports in container rollout-operator. #10273
+* [BUGFIX] When downscaling is enabled, the components must annotate `prepare-downscale-http-port` with the value set in `$._config.server_http_port`. #10367
 
 ### Mimirtool
 

diff --git a/operations/mimir-tests/test-automated-downscale-generated.yaml b/operations/mimir-tests/test-automated-downscale-generated.yaml
@@ -1343,7 +1343,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/min-time-between-zones-downscale: 12h
@@ -1471,7 +1471,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -1599,7 +1599,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-b
     rollout-max-unavailable: "50"
   labels:

diff --git a/operations/mimir-tests/test-automated-downscale-v2-generated.yaml b/operations/mimir-tests/test-automated-downscale-v2-generated.yaml
@@ -1402,7 +1402,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-delayed-downscale: 13h
     grafana.com/rollout-mirror-replicas-from-resource-api-version: rollout-operator.grafana.com/v1
     grafana.com/rollout-mirror-replicas-from-resource-kind: ReplicaTemplate
@@ -1534,7 +1534,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-delayed-downscale: 13h
     grafana.com/rollout-mirror-replicas-from-resource-api-version: rollout-operator.grafana.com/v1
     grafana.com/rollout-mirror-replicas-from-resource-kind: ReplicaTemplate
@@ -1667,7 +1667,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-delayed-downscale: 13h
     grafana.com/rollout-mirror-replicas-from-resource-api-version: rollout-operator.grafana.com/v1
     grafana.com/rollout-mirror-replicas-from-resource-kind: ReplicaTemplate

diff --git a/...ns/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml b/...ns/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml
@@ -1830,7 +1830,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-delayed-downscale: 13h
     grafana.com/rollout-mirror-replicas-from-resource-api-version: rollout-operator.grafana.com/v1
     grafana.com/rollout-mirror-replicas-from-resource-kind: ReplicaTemplate
@@ -1980,7 +1980,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -2120,7 +2120,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:

diff --git a/operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml b/operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml
@@ -1830,7 +1830,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-delayed-downscale: 13h
     grafana.com/rollout-mirror-replicas-from-resource-api-version: rollout-operator.grafana.com/v1
     grafana.com/rollout-mirror-replicas-from-resource-kind: ReplicaTemplate
@@ -1980,7 +1980,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -2120,7 +2120,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:

diff --git a/operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml b/operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml
@@ -1830,7 +1830,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-delayed-downscale: 13h
     grafana.com/rollout-mirror-replicas-from-resource-api-version: rollout-operator.grafana.com/v1
     grafana.com/rollout-mirror-replicas-from-resource-kind: ReplicaTemplate
@@ -1980,7 +1980,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -2120,7 +2120,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:

diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-0-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-0-generated.yaml
@@ -1718,7 +1718,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/min-time-between-zones-downscale: 12h
@@ -1855,7 +1855,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -1986,7 +1986,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-b
     rollout-max-unavailable: "50"
   labels:

diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-1-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-1-generated.yaml
@@ -1791,7 +1791,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/min-time-between-zones-downscale: 12h
@@ -1929,7 +1929,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"
@@ -2078,7 +2078,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -2210,7 +2210,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"
@@ -2353,7 +2353,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-b
     rollout-max-unavailable: "50"
   labels:
@@ -2485,7 +2485,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"

diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml
@@ -1807,7 +1807,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/min-time-between-zones-downscale: "0"
@@ -1953,7 +1953,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:

diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-11-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-11-generated.yaml
@@ -1807,7 +1807,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-delayed-downscale: 13h
     grafana.com/rollout-mirror-replicas-from-resource-api-version: rollout-operator.grafana.com/v1
     grafana.com/rollout-mirror-replicas-from-resource-kind: ReplicaTemplate
@@ -1957,7 +1957,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:

diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-2-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-2-generated.yaml
@@ -1804,7 +1804,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/min-time-between-zones-downscale: 12h
@@ -1942,7 +1942,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"
@@ -2091,7 +2091,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -2223,7 +2223,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"
@@ -2366,7 +2366,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-b
     rollout-max-unavailable: "50"
   labels:
@@ -2498,7 +2498,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"

diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-3-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-3-generated.yaml
@@ -1826,7 +1826,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/min-time-between-zones-downscale: 12h
@@ -1964,7 +1964,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"
@@ -2113,7 +2113,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-a
     rollout-max-unavailable: "50"
   labels:
@@ -2245,7 +2245,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"
@@ -2388,7 +2388,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     grafana.com/rollout-downscale-leader: ingester-zone-b
     rollout-max-unavailable: "50"
   labels:
@@ -2520,7 +2520,7 @@ kind: StatefulSet
 metadata:
   annotations:
     grafana.com/prepare-downscale-http-path: ingester/prepare-shutdown
-    grafana.com/prepare-downscale-http-port: "80"
+    grafana.com/prepare-downscale-http-port: "8080"
     rollout-max-unavailable: "50"
   labels:
     grafana.com/prepare-downscale: "true"