diff --git a/dist/chart/templates/rbac/clickhousecluster-admin-role.yaml b/dist/chart/templates/rbac/clickhousecluster-admin-role.yaml index 8ca4071d5..788f1b290 100644 --- a/dist/chart/templates/rbac/clickhousecluster-admin-role.yaml +++ b/dist/chart/templates/rbac/clickhousecluster-admin-role.yaml @@ -14,6 +14,9 @@ metadata: app.kubernetes.io/name: {{ include "clickhouse-operator.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/instance: {{ .Release.Name }} + {{- if .Values.rbac.helpers.aggregateRoles.admin and not (.Values.rbac.namespaced) }} + rbac.authorization.k8s.io/aggregate-to-admin: "true" + {{- end }} name: {{ include "clickhouse-operator.resourceName" (dict "suffix" "clickhousecluster-admin-role" "context" $) }} rules: - apiGroups: diff --git a/dist/chart/templates/rbac/clickhousecluster-editor-role.yaml b/dist/chart/templates/rbac/clickhousecluster-editor-role.yaml index 6eb959a2e..fbfffaeab 100644 --- a/dist/chart/templates/rbac/clickhousecluster-editor-role.yaml +++ b/dist/chart/templates/rbac/clickhousecluster-editor-role.yaml @@ -14,6 +14,9 @@ metadata: app.kubernetes.io/name: {{ include "clickhouse-operator.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/instance: {{ .Release.Name }} + {{- if .Values.rbac.helpers.aggregateRoles.editor and not (.Values.rbac.namespaced) }} + rbac.authorization.k8s.io/aggregate-to-edit: "true" + {{- end }} name: {{ include "clickhouse-operator.resourceName" (dict "suffix" "clickhousecluster-editor-role" "context" $) }} rules: - apiGroups: diff --git a/dist/chart/templates/rbac/clickhousecluster-viewer-role.yaml b/dist/chart/templates/rbac/clickhousecluster-viewer-role.yaml index b460b0c62..9abd744ae 100644 --- a/dist/chart/templates/rbac/clickhousecluster-viewer-role.yaml +++ b/dist/chart/templates/rbac/clickhousecluster-viewer-role.yaml @@ -14,6 +14,9 @@ metadata: app.kubernetes.io/name: {{ include "clickhouse-operator.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/instance: {{ .Release.Name }} + {{- if .Values.rbac.helpers.aggregateRoles.viewer and not (.Values.rbac.namespaced) }} + rbac.authorization.k8s.io/aggregate-to-view: "true" + {{- end }} name: {{ include "clickhouse-operator.resourceName" (dict "suffix" "clickhousecluster-viewer-role" "context" $) }} rules: - apiGroups: diff --git a/dist/chart/templates/rbac/keepercluster-admin-role.yaml b/dist/chart/templates/rbac/keepercluster-admin-role.yaml index 270f0f6a7..79f7b76b3 100644 --- a/dist/chart/templates/rbac/keepercluster-admin-role.yaml +++ b/dist/chart/templates/rbac/keepercluster-admin-role.yaml @@ -14,6 +14,9 @@ metadata: app.kubernetes.io/name: {{ include "clickhouse-operator.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/instance: {{ .Release.Name }} + {{- if .Values.rbac.helpers.aggregateRoles.admin and not (.Values.rbac.namespaced) }} + rbac.authorization.k8s.io/aggregate-to-admin: "true" + {{- end }} name: {{ include "clickhouse-operator.resourceName" (dict "suffix" "keepercluster-admin-role" "context" $) }} rules: - apiGroups: diff --git a/dist/chart/templates/rbac/keepercluster-editor-role.yaml b/dist/chart/templates/rbac/keepercluster-editor-role.yaml index 1cd6f520b..a5d3d957c 100644 --- a/dist/chart/templates/rbac/keepercluster-editor-role.yaml +++ b/dist/chart/templates/rbac/keepercluster-editor-role.yaml @@ -14,6 +14,9 @@ metadata: app.kubernetes.io/name: {{ include "clickhouse-operator.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/instance: {{ .Release.Name }} + {{- if .Values.rbac.helpers.aggregateRoles.editor and not (.Values.rbac.namespaced) }} + rbac.authorization.k8s.io/aggregate-to-edit: "true" + {{- end }} name: {{ include "clickhouse-operator.resourceName" (dict "suffix" "keepercluster-editor-role" "context" $) }} rules: - apiGroups: diff --git a/dist/chart/templates/rbac/keepercluster-viewer-role.yaml b/dist/chart/templates/rbac/keepercluster-viewer-role.yaml index 1c5145c59..40a1761d7 100644 --- a/dist/chart/templates/rbac/keepercluster-viewer-role.yaml +++ b/dist/chart/templates/rbac/keepercluster-viewer-role.yaml @@ -14,6 +14,9 @@ metadata: app.kubernetes.io/name: {{ include "clickhouse-operator.name" . }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/instance: {{ .Release.Name }} + {{- if .Values.rbac.helpers.aggregateRoles.viewer and not (.Values.rbac.namespaced) }} + rbac.authorization.k8s.io/aggregate-to-view: "true" + {{- end }} name: {{ include "clickhouse-operator.resourceName" (dict "suffix" "keepercluster-viewer-role" "context" $) }} rules: - apiGroups: diff --git a/dist/chart/values.yaml b/dist/chart/values.yaml index 6ab265612..09cf54dd8 100644 --- a/dist/chart/values.yaml +++ b/dist/chart/values.yaml @@ -184,6 +184,10 @@ rbac: ## Install convenience admin/editor/viewer roles for CRDs ## enabled: false + aggregateRoles: + admin: true + editor: true + viewer: true ## ServiceAccount configuration ##