diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e9c288256..4ad33a6cfe 100644 --- 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 index 40c6083d27..34d2405da8 100644 --- 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 index c0901a89fb..e4b65d6e85 100644 --- 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/operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml b/operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml index f4daaf744b..4d424dbae6 100644 --- a/operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml +++ b/operations/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 index 8dd4db355d..3fb5dbceca 100644 --- 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 index b0fc799264..9499e087d2 100644 --- 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 index 8bf56e1e4b..6b5ce9837b 100644 --- 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 index 5e19e88afb..9547123e85 100644 --- 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 index cd9408be3a..2ae95d70b4 100644 --- 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 index 01f213945c..622b78cd02 100644 --- 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 index a9fafd4b42..8c28d66598 100644 --- 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 index b68e1ef177..f5e67089cb 100644 --- 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" diff --git a/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml index 182a6fc867..17a6cda392 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-4-generated.yaml @@ -1824,7 +1824,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 @@ -1962,7 +1962,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" @@ -2111,7 +2111,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: @@ -2243,7 +2243,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" @@ -2386,7 +2386,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: @@ -2518,7 +2518,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-5a-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-5a-generated.yaml index 767dd54a53..1c57caf5f1 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-5a-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-5a-generated.yaml @@ -1824,7 +1824,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" @@ -1962,7 +1962,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" @@ -2111,7 +2111,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: @@ -2243,7 +2243,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" @@ -2386,7 +2386,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: @@ -2518,7 +2518,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-5b-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-5b-generated.yaml index 0810373ecb..f92629ef47 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-5b-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-5b-generated.yaml @@ -1824,7 +1824,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" @@ -1962,7 +1962,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" @@ -2111,7 +2111,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: @@ -2243,7 +2243,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" @@ -2386,7 +2386,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: @@ -2518,7 +2518,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-6-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-6-generated.yaml index 1a0656249c..f8198ecec0 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-6-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-6-generated.yaml @@ -1755,7 +1755,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" @@ -1904,7 +1904,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" @@ -2047,7 +2047,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-7-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-7-generated.yaml index 2129ad02c5..d6eac6be16 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-7-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-7-generated.yaml @@ -1771,7 +1771,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" @@ -1920,7 +1920,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" @@ -2063,7 +2063,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-8-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-8-generated.yaml index a7f9b2d15e..25a5f47f88 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-8-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-8-generated.yaml @@ -1771,7 +1771,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" @@ -1920,7 +1920,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" @@ -2063,7 +2063,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-9-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-9-generated.yaml index f57962fa72..53716992b4 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-9-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-9-generated.yaml @@ -1748,7 +1748,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" @@ -1894,7 +1894,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-final-generated.yaml b/operations/mimir-tests/test-ingest-storage-migration-step-final-generated.yaml index 3ba6600866..c674ba8159 100644 --- a/operations/mimir-tests/test-ingest-storage-migration-step-final-generated.yaml +++ b/operations/mimir-tests/test-ingest-storage-migration-step-final-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/ingest-storage-ingester-autoscaling.libsonnet b/operations/mimir/ingest-storage-ingester-autoscaling.libsonnet index 41ea24badc..d826906661 100644 --- a/operations/mimir/ingest-storage-ingester-autoscaling.libsonnet +++ b/operations/mimir/ingest-storage-ingester-autoscaling.libsonnet @@ -98,7 +98,7 @@ statefulSet.mixin.metadata.withAnnotationsMixin( { 'grafana.com/prepare-downscale-http-path': 'ingester/prepare-shutdown', // We want to tell ingesters that they are shutting down. - 'grafana.com/prepare-downscale-http-port': '80', + 'grafana.com/prepare-downscale-http-port': '%(server_http_port)s' % $._config, } + ( if zone == $._config.ingest_storage_ingester_autoscaling_primary_zone then { 'grafana.com/rollout-mirror-replicas-from-resource-name': $._config.ingest_storage_ingester_autoscaling_primary_zone, diff --git a/operations/mimir/ingest-storage-migration.libsonnet b/operations/mimir/ingest-storage-migration.libsonnet index f86c41e9b3..f3fc7d7c2b 100644 --- a/operations/mimir/ingest-storage-migration.libsonnet +++ b/operations/mimir/ingest-storage-migration.libsonnet @@ -67,7 +67,7 @@ }) + statefulSet.mixin.metadata.withAnnotationsMixin({ 'grafana.com/prepare-downscale-http-path': 'ingester/prepare-shutdown', - 'grafana.com/prepare-downscale-http-port': '80', + 'grafana.com/prepare-downscale-http-port': '%(server_http_port)s' % $._config, }), local partitionIngesterStatefulSetPolicies = diff --git a/operations/mimir/ingester-automated-downscale-v2.libsonnet b/operations/mimir/ingester-automated-downscale-v2.libsonnet index 165630a12d..d0e85202f8 100644 --- a/operations/mimir/ingester-automated-downscale-v2.libsonnet +++ b/operations/mimir/ingester-automated-downscale-v2.libsonnet @@ -57,7 +57,7 @@ // Endpoint for telling ingester that it's going to be scaled down. Ingester will flush the // data and unregister from the ring on shutdown. 'grafana.com/prepare-downscale-http-path': 'ingester/prepare-shutdown', - 'grafana.com/prepare-downscale-http-port': '80', + 'grafana.com/prepare-downscale-http-port': '%(server_http_port)s' % $._config, // Ingester statefulset will follow number of replicas from ReplicaTemplate/ingester-zone-a. '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/operations/mimir/ingester-automated-downscale.libsonnet b/operations/mimir/ingester-automated-downscale.libsonnet index 1b9ecad623..8ffefb0d1f 100644 --- a/operations/mimir/ingester-automated-downscale.libsonnet +++ b/operations/mimir/ingester-automated-downscale.libsonnet @@ -33,7 +33,7 @@ }) + statefulSet.mixin.metadata.withAnnotationsMixin({ 'grafana.com/prepare-downscale-http-path': 'ingester/prepare-shutdown', - 'grafana.com/prepare-downscale-http-port': '80', + 'grafana.com/prepare-downscale-http-port': '%(server_http_port)s' % $._config, }), // Ingester prepare-downscale configuration