From 08f26aa3531d6357794c94cee1d964d874fd69da Mon Sep 17 00:00:00 2001 From: Jared Rodriguez Date: Wed, 5 Feb 2020 16:57:03 -0600 Subject: [PATCH] use consistent naming for opsportal roles --- stable/opsportal/Chart.yaml | 2 +- stable/opsportal/templates/ingress-opsportal-roles.yaml | 7 +++---- stable/opsportal/templates/kibana-roles.yaml | 6 +++--- staging/prometheus-operator/Chart.yaml | 2 +- .../templates/ingress-rbac/alertmanager.yaml | 6 +++--- .../templates/ingress-rbac/grafana.yaml | 6 +++--- .../templates/ingress-rbac/prometheus.yaml | 6 +++--- staging/traefik/Chart.yaml | 2 +- staging/traefik/templates/dashboard-roles.yaml | 6 +++--- 9 files changed, 21 insertions(+), 22 deletions(-) diff --git a/stable/opsportal/Chart.yaml b/stable/opsportal/Chart.yaml index f9179e189..168ed9ace 100644 --- 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 index 85af536d6..ae6864867 100644 --- 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 index 2d8e0188c..bef0348f1 100644 --- 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 index c9a09d44f..22105c3d9 100644 --- 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 index be6fb3a0f..68e2436f6 100644 --- 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 index 1ea4cca47..b830a66dd 100644 --- 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 index 5ac0be81e..a1747f309 100644 --- 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 index 314daac69..8a1766a63 100644 --- 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 index 330428efa..5c8aaf99a 100644 --- 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" . }}