Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jan 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c47081b
mimir: pass downscale endpoint port from config
narqo Jan 7, 2025
dd28078
update changelog
narqo Jan 7, 2025
9810993
rebuild assets
narqo Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
* [CHANGE] Update rollout-operator version to 0.22.0. #10229
* [CHANGE] Memcached: Update to Memcached 1.6.34. #10318
* [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

Expand Down
6 changes: 3 additions & 3 deletions operations/mimir-tests/test-automated-downscale-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions operations/mimir-tests/test-automated-downscale-v2-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...ns/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions operations/mimir-tests/test-ingest-storage-migration-step-0-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions operations/mimir-tests/test-ingest-storage-migration-step-1-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2075,7 +2075,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:
Expand Down Expand Up @@ -2207,7 +2207,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"
Expand Down Expand Up @@ -2347,7 +2347,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:
Expand Down Expand Up @@ -2479,7 +2479,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"
Expand Down
4 changes: 2 additions & 2 deletions operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions operations/mimir-tests/test-ingest-storage-migration-step-11-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions operations/mimir-tests/test-ingest-storage-migration-step-2-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2088,7 +2088,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:
Expand Down Expand Up @@ -2220,7 +2220,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"
Expand Down Expand Up @@ -2360,7 +2360,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:
Expand Down Expand Up @@ -2492,7 +2492,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"
Expand Down
12 changes: 6 additions & 6 deletions operations/mimir-tests/test-ingest-storage-migration-step-3-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2110,7 +2110,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:
Expand Down Expand Up @@ -2242,7 +2242,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"
Expand Down Expand Up @@ -2382,7 +2382,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:
Expand Down Expand Up @@ -2514,7 +2514,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"
Expand Down
Loading
Loading