Rollout operator psp (grafana#3686)

* make rollout-operator able to use psp * add new role-binding to generated templates * add changelog entry * add generated golden records
udmire · Dec 16, 2022 · a2bf340 · a2bf340
1 parent e9251a0
commit a2bf340
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 0 deletions.
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -30,6 +30,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 
 * [ENHANCEMENT] Update the `rollout-operator` subchart to `0.2.0`. #3624
 * [ENHANCEMENT] Add ability to manage PrometheusRule for metamonitoring with Prometheus operator from the Helm chart. The alerts are disabled by default but can be enabled with `prometheusRule.mimirAlerts` set to `true`. To enable the default rules, set `mimirRules` to `true`. #2134 #2609
+* [BUGFIX] Enable `rollout-operator` to use PodSecurityPolicies if necessary
 
 ## 4.0.0
 

diff --git a/operations/helm/charts/mimir-distributed/templates/rolebinding.yaml b/operations/helm/charts/mimir-distributed/templates/rolebinding.yaml
@@ -15,4 +15,8 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ template "mimir.serviceAccountName" . }}
+{{- if .Values.rollout_operator.enabled }}
+- kind: ServiceAccount
+  name: {{ include "rollout-operator.serviceAccountName" . }}
+{{- end }}
 {{- end }}
diff --git a/...lm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml b/...lm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: gateway-enterprise-values-mimir
+- kind: ServiceAccount
+  name: gateway-enterprise-values-mimir-distributed
diff --git a/...ns/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/rolebinding.yaml b/...ns/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: gateway-nginx-values-mimir
+- kind: ServiceAccount
+  name: gateway-nginx-values-mimir-distributed
diff --git a/operations/helm/tests/large-values-generated/mimir-distributed/templates/rolebinding.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: large-values-mimir
+- kind: ServiceAccount
+  name: large-values-mimir-distributed
diff --git a/...s/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/rolebinding.yaml b/...s/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: scheduler-name-values-mimir
+- kind: ServiceAccount
+  name: scheduler-name-values-mimir-distributed
diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/rolebinding.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: small-values-mimir
+- kind: ServiceAccount
+  name: small-values-mimir-distributed
diff --git a/...est-enterprise-legacy-label-values-generated/mimir-distributed/templates/rolebinding.yaml b/...est-enterprise-legacy-label-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: test-enterprise-legacy-label-values-enterprise-metrics
+- kind: ServiceAccount
+  name: test-enterprise-legacy-label-values-mimir-distributed
diff --git a/.../helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml b/.../helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: test-enterprise-values-mimir
+- kind: ServiceAccount
+  name: test-enterprise-values-mimir-distributed
diff --git a/.../test-oss-logical-multizone-values-generated/mimir-distributed/templates/rolebinding.yaml b/.../test-oss-logical-multizone-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: test-oss-logical-multizone-values-mimir
+- kind: ServiceAccount
+  name: test-oss-logical-multizone-values-mimir-distributed
diff --git a/...lm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/rolebinding.yaml b/...lm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/rolebinding.yaml
@@ -16,3 +16,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: test-oss-multizone-values-mimir
+- kind: ServiceAccount
+  name: test-oss-multizone-values-mimir-distributed