fix: use consistent naming for opsportal roles (#409)

Co-authored-by: Alejandro Escobar <[email protected]>
mesosphere · Feb 6, 2020 · a4660e2 · a4660e2
1 parent 749c67c
commit a4660e2
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git a/stable/opsportal/Chart.yaml b/stable/opsportal/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.0.0
 home: https://github.com/mesosphere/charts
 description: OpsPortal Chart
 name: opsportal
-version: 0.2.2
+version: 0.2.3
 maintainers:
   - name: hectorj2f
   - name: alejandroEsc

diff --git a/stable/opsportal/templates/ingress-opsportal-roles.yaml b/stable/opsportal/templates/ingress-opsportal-roles.yaml
@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "opsportal.fullname" . }}-admin
+  name: opsportal-admin
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
@@ -23,7 +23,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "opsportal.fullname" . }}-view
+  name: opsportal-view
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
@@ -32,7 +32,6 @@ rules:
 - nonResourceURLs:
   - {{ .Values.opsportalRBAC.path | trimSuffix "/"}}
   - {{ .Values.opsportalRBAC.path | trimSuffix "/" }}/*
-  - {{ .Values.opsportalRBAC.graphqlPath | trimSuffix "/"}}
   verbs:
   - get
   - head
@@ -48,7 +47,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "opsportal.fullname" . }}-edit
+  name: opsportal-edit
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}

diff --git a/stable/opsportal/templates/kibana-roles.yaml b/stable/opsportal/templates/kibana-roles.yaml
@@ -6,7 +6,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "opsportal.fullname" . }}-kibana-edit
+  name: opsportal-kibana-edit
   lables:
     app: {{ template "opsportal.fullname" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -25,7 +25,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "opsportal.fullname" . }}-kibana-admin
+  name: opsportal-kibana-admin
   lables:
     app: {{ template "opsportal.fullname" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -45,7 +45,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "opsportal.fullname" . }}-kibana-view
+  name: opsportal-kibana-view
   lables:
     app: {{ template "opsportal.fullname" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/staging/prometheus-operator/Chart.yaml b/staging/prometheus-operator/Chart.yaml
@@ -12,7 +12,7 @@ sources:
   - https://github.com/coreos/kube-prometheus
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 8.3.10
+version: 8.3.11
 appVersion: 0.34.0
 tillerVersion: ">=2.12.0"
 home: https://github.com/coreos/prometheus-operator

diff --git a/staging/prometheus-operator/templates/ingress-rbac/alertmanager.yaml b/staging/prometheus-operator/templates/ingress-rbac/alertmanager.yaml
@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-alertmanager-admin
+  name: opsportal-alertmanager-admin
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{- if .Values.alertmanager.ingress.labels }}
@@ -27,7 +27,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-alertmanager-view
+  name: opsportal-alertmanager-view
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{- if .Values.alertmanager.ingress.labels }}
@@ -48,7 +48,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-alertmanager-edit
+  name: opsportal-alertmanager-edit
   labels:
     app: {{ template "prometheus-operator.name" . }}-alertmanager
 {{- if .Values.alertmanager.ingress.labels }}

diff --git a/staging/prometheus-operator/templates/ingress-rbac/grafana.yaml b/staging/prometheus-operator/templates/ingress-rbac/grafana.yaml
@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-grafana-admin
+  name: opsportal-grafana-admin
   labels:
     app: {{ template "prometheus-operator.name" . }}-grafana
 {{- if .Values.grafana.ingress.labels }}
@@ -25,7 +25,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-grafana-view
+  name: opsportal-grafana-view
   labels:
     app: {{ template "prometheus-operator.name" . }}-grafana
 {{- if .Values.grafana.ingress.labels }}
@@ -44,7 +44,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-grafana-edit
+  name: opsportal-grafana-edit
   labels:
     app: {{ template "prometheus-operator.name" . }}-grafana
 {{- if .Values.grafana.ingress.labels }}

diff --git a/staging/prometheus-operator/templates/ingress-rbac/prometheus.yaml b/staging/prometheus-operator/templates/ingress-rbac/prometheus.yaml
@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-prom-admin
+  name: opsportal-prometheus-admin
   labels:
     app: {{ template "prometheus-operator.name" . }}-prom
   {{- if .Values.prometheus.ingress.labels }}
@@ -27,7 +27,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-prom-view
+  name: opsportal-prometheus-view
   labels:
     app: {{ template "prometheus-operator.name" . }}-prom
   {{- if .Values.prometheus.ingress.labels }}
@@ -48,7 +48,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "prometheus-operator.name" . }}-prom-edit
+  name: opsportal-prometheus-edit
   labels:
     app: {{ template "prometheus-operator.name" . }}-prom
   {{- if .Values.prometheus.ingress.labels }}

diff --git a/staging/traefik/Chart.yaml b/staging/traefik/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: traefik
-version: 1.72.14
+version: 1.72.15
 appVersion: 1.7.12
 description: A Traefik based Kubernetes ingress controller with Let's Encrypt support
 keywords:

diff --git a/staging/traefik/templates/dashboard-roles.yaml b/staging/traefik/templates/dashboard-roles.yaml
@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "traefik.fullname" . }}-dashboard-view
+  name: opsportal-traefik-view
   labels:
     app: {{ template "traefik.name" . }}
     chart: {{ template "traefik.chart" . }}
@@ -21,7 +21,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "traefik.fullname" . }}-dashboard-edit
+  name: opsportal-traefik-edit
   labels:
     app: {{ template "traefik.name" . }}
     chart: {{ template "traefik.chart" . }}
@@ -41,7 +41,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "traefik.fullname" . }}-dashboard-admin
+  name: opsportal-traefik-admin
   labels:
     app: {{ template "traefik.name" . }}
     chart: {{ template "traefik.chart" . }}