Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions charts/px-central/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ Create chart name and version as used by the chart label.
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Suffix appended to cluster-scoped resource names (ClusterRole, ClusterRoleBinding)
to let the chart be installed in multiple namespaces on the same cluster.
Renders `-<suffix>` when .Values.clusterScopedSuffix is set, empty otherwise.
*/}}
{{- define "px-central.clusterScopedSuffix" -}}
{{- with .Values.clusterScopedSuffix -}}
-{{ . }}
{{- end -}}
{{- end -}}

{{/*
Common labels
*/}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ spec:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: px-backup-pre-setup-clusterrole
name: px-backup-pre-setup-clusterrole{{ include "px-central.clusterScopedSuffix" . }}
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "0"
Expand All @@ -375,7 +375,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: px-backup-pre-setup-clusterrolebinding
name: px-backup-pre-setup-clusterrolebinding{{ include "px-central.clusterScopedSuffix" . }}
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "1"
Expand All @@ -390,5 +390,5 @@ subjects:
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: px-backup-pre-setup-clusterrole
name: px-backup-pre-setup-clusterrole{{ include "px-central.clusterScopedSuffix" . }}
apiGroup: rbac.authorization.k8s.io
6 changes: 3 additions & 3 deletions charts/px-central/templates/px-backup/pxcentral-backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: px-backup-cluster-role
name: px-backup-cluster-role{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
Expand Down Expand Up @@ -49,7 +49,7 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: px-backup-cluster-role-binding
name: px-backup-cluster-role-binding{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-apiserver
Expand All @@ -60,7 +60,7 @@ subjects:
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: px-backup-cluster-role
name: px-backup-cluster-role{{ include "px-central.clusterScopedSuffix" . }}
apiGroup: rbac.authorization.k8s.io
---
kind: Role
Expand Down
12 changes: 6 additions & 6 deletions charts/px-central/templates/px-backup/pxcentral-prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: pxc-prometheus-operator
name: pxc-prometheus-operator{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
Expand All @@ -40,12 +40,12 @@ subjects:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: pxc-prometheus-operator
name: pxc-prometheus-operator{{ include "px-central.clusterScopedSuffix" . }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: pxc-prometheus-operator
name: pxc-prometheus-operator{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
Expand Down Expand Up @@ -208,7 +208,7 @@ spec:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: px-backup-dashboard-prometheus
name: px-backup-dashboard-prometheus{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
Expand Down Expand Up @@ -240,15 +240,15 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: px-backup-dashboard-prometheus
name: px-backup-dashboard-prometheus{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
{{- include "px-central.labels" . | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: px-backup-dashboard-prometheus
name: px-backup-dashboard-prometheus{{ include "px-central.clusterScopedSuffix" . }}
subjects:
- kind: ServiceAccount
name: px-backup-dashboard-prometheus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ roleRef:
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Release.Name | quote }}
name: {{ printf "%s%s" .Release.Name (include "px-central.clusterScopedSuffix" .) | quote }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-apiserver
Expand All @@ -59,7 +59,7 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Release.Name | quote }}
name: {{ printf "%s%s" .Release.Name (include "px-central.clusterScopedSuffix" .) | quote }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-apiserver
Expand All @@ -70,7 +70,7 @@ subjects:
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: {{ .Release.Name | quote }}
name: {{ printf "%s%s" .Release.Name (include "px-central.clusterScopedSuffix" .) | quote }}
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: pxcentral-prometheus
name: pxcentral-prometheus{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-prometheus
Expand All @@ -51,15 +51,15 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: pxcentral-prometheus
name: pxcentral-prometheus{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-prometheus
{{- include "px-central.labels" . | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: pxcentral-prometheus
name: pxcentral-prometheus{{ include "px-central.clusterScopedSuffix" . }}
subjects:
- kind: ServiceAccount
name: pxcentral-prometheus
Expand Down Expand Up @@ -234,7 +234,7 @@ spec:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: pxcentral-prometheus-operator
name: pxcentral-prometheus-operator{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-prometheus
Expand Down Expand Up @@ -296,15 +296,15 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: pxcentral-prometheus-operator
name: pxcentral-prometheus-operator{{ include "px-central.clusterScopedSuffix" . }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-prometheus
{{- include "px-central.labels" . | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: pxcentral-prometheus-operator
name: pxcentral-prometheus-operator{{ include "px-central.clusterScopedSuffix" . }}
subjects:
- kind: ServiceAccount
name: pxcentral-prometheus-operator
Expand Down
7 changes: 7 additions & 0 deletions charts/px-central/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ podAntiAffinity: false

caCertsSecretName: ""

# Suffix appended to cluster-scoped resource names (ClusterRole, ClusterRoleBinding)
# so the chart can be installed in multiple namespaces on the same cluster.
# Leave empty to preserve legacy (unsuffixed) names. When installing multiple
# releases of this chart on the same cluster, set this to a unique identifier
# per release (for example the namespace).
clusterScopedSuffix: ""

oidc:
centralOIDC:
enabled: true
Expand Down
Loading