feat: remove optional private grafana (#1783)

linode · Oct 30, 2024 · 9cc2b7e · 9cc2b7e
1 parent 7f1f6d3
commit 9cc2b7e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/helmfile.d/helmfile-60.teams.yaml b/helmfile.d/helmfile-60.teams.yaml
@@ -79,7 +79,10 @@ releases:
           fullnameOverride: {{ $teamId }}-po-grafana
           grafana.ini:
             "auth.generic_oauth":
-              role_attribute_path: contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'platform-admin') && 'Admin' || contains(groups[*], 'team-{{ $teamId }}') && 'Editor'{{ if not ($team | get "managedMonitoring.private" false) }} || 'Viewer'{{- end }}
+              role_attribute_path: >-
+                contains(groups[*], 'admin') && 'Admin' ||
+                contains(groups[*], 'platform-admin') && 'Admin' ||
+                contains(groups[*], 'team-{{ $teamId }}') && 'Editor'
             server:
               root_url: https://grafana-{{ $teamId }}.{{ $domain }}
             analytics:

diff --git a/values-changes.yaml b/values-changes.yaml
@@ -312,3 +312,6 @@ changes:
     relocations:
       - 'oidc.adminGroupID': 'oidc.platformAdminGroupID'
       - 'oidc.teamAdminGroupID': 'oidc.allTeamsAdminGroupID'
+  - version: 31
+    deletions:
+      - 'teamConfig.{team}.managedMonitoring.private'
diff --git a/values-schema.yaml b/values-schema.yaml
@@ -1141,9 +1141,6 @@ definitions:
           alertmanager:
             type: boolean
             default: false
-          private:
-            type: boolean
-            default: false
       networkPolicy:
         ingressPrivate:
           title: Enable filtering of ingress traffic inside the cluster