From ac4fb8ba2a9195ef0966f42ea9fbadd4ff5a0eb3 Mon Sep 17 00:00:00 2001 From: Kyle Fazzari Date: Mon, 5 Jan 2026 16:06:57 -0800 Subject: [PATCH 1/2] Add how to opt out of rollout-operator to v5 -> v6 docs Upgrading without this leads to a mimir deployment that can no longer be modified. Signed-off-by: Kyle Fazzari --- .../migrate-helm-chart-5.x-to-6.0.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md b/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md index dba87936deb..e347844658c 100644 --- a/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md +++ b/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md @@ -27,7 +27,9 @@ If your values file contains a top-level `nginx` section, you must migrate to th Follow the [Migrate to unified proxy deployment](https://grafana.com/docs/helm-charts/mimir-distributed/v5.8.x/migration-guides/migrate-to-unified-proxy-deployment/) guide to complete this migration. -### Install rollout-operator CRDs (if using rollout-operator) +### Account for the rollout-operator + +#### If using, install CRDs If you're using the rollout-operator, install the CRDs from the rollout-operator chart: @@ -36,6 +38,15 @@ kubectl apply -f https://raw.githubusercontent.com/grafana/helm-charts/main/char kubectl apply -f https://raw.githubusercontent.com/grafana/helm-charts/main/charts/rollout-operator/crds/zone-aware-pod-disruption-budget-custom-resource-definition.yaml ``` +#### If not using, disable webhooks + +If you've opted not to use the rollout-operator, disable it in your values file: + +```yaml +rollout_operator: + enabled: false +``` + ### Choose your ingest storage strategy Choose one of the following options: From 0217cbb5b78b385f9db2cba076065773dc9b1d1e Mon Sep 17 00:00:00 2001 From: Kyle Fazzari Date: Tue, 6 Jan 2026 10:44:11 -0800 Subject: [PATCH 2/2] Reword to suit feedback Signed-off-by: Kyle Fazzari --- .../migration-guides/migrate-helm-chart-5.x-to-6.0.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md b/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md index e347844658c..fe5f27cdb99 100644 --- a/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md +++ b/docs/sources/helm-charts/mimir-distributed/migration-guides/migrate-helm-chart-5.x-to-6.0.md @@ -29,7 +29,9 @@ Follow the [Migrate to unified proxy deployment](https://grafana.com/docs/helm-c ### Account for the rollout-operator -#### If using, install CRDs +If your deployment uses the rollout-operator, you must ensure that the required CustomResourceDefinitions (CRDs) are installed. If you don't use the rollout-operator, you must explicitly disable it in your values file to avoid unnecessary components and issues with subsequent rollouts. + +#### Install CRDs if using the rollout-operator If you're using the rollout-operator, install the CRDs from the rollout-operator chart: @@ -38,9 +40,9 @@ kubectl apply -f https://raw.githubusercontent.com/grafana/helm-charts/main/char kubectl apply -f https://raw.githubusercontent.com/grafana/helm-charts/main/charts/rollout-operator/crds/zone-aware-pod-disruption-budget-custom-resource-definition.yaml ``` -#### If not using, disable webhooks +#### Disable the rollout-operator if not in use -If you've opted not to use the rollout-operator, disable it in your values file: +If you don't use the rollout-operator, disable it in your values file to prevent the installation of related webhooks which will interfere with subsequent rollouts: ```yaml rollout_operator: