Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use consistent naming for opsportal roles #409

Merged
merged 2 commits into from
Feb 6, 2020
Merged

Use consistent naming for opsportal roles #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08f26aa
use consistent naming for opsportal roles
jr0d Feb 5, 2020
3b6027b
Merge branch 'master' into jr/role-name-change
alejandroEsc Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/opsportal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions stable/opsportal/templates/ingress-opsportal-roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -32,7 +32,6 @@ rules:
- nonResourceURLs:
- {{ .Values.opsportalRBAC.path | trimSuffix "/"}}
- {{ .Values.opsportalRBAC.path | trimSuffix "/" }}/*
- {{ .Values.opsportalRBAC.graphqlPath | trimSuffix "/"}}
Copy link
Contributor

@dkoshkin dkoshkin Feb 6, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it was redundant

verbs:
- get
- head
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions stable/opsportal/templates/kibana-roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion staging/prometheus-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions staging/prometheus-operator/templates/ingress-rbac/alertmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions staging/prometheus-operator/templates/ingress-rbac/grafana.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions staging/prometheus-operator/templates/ingress-rbac/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion staging/traefik/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions staging/traefik/templates/dashboard-roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
Expand All @@ -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" . }}
Expand All @@ -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" . }}
Expand Down