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

PB-8335 | Fixes #664 - Support Multi instances of px-central - multi Helm releases #665

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+19 −31
Open

PB-8335 | Fixes #664 - Support Multi instances of px-central - multi Helm releases #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02b3883
feat(px-central): Support multi-instances within same cluster
abdennour Nov 5, 2024
2073d29
style(px-central): remove uneeded metadata field #664
abdennour Nov 5, 2024
3d065e7
fix(px-central): helm linting #644
abdennour Nov 5, 2024
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 charts/px-central/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ keywords:
name: px-central
sources:
- https://github.com/portworx/helm/tree/master/charts/px-central
version: 2.7.3
version: 2.7.4
appVersion: 2.7.3
name: px-central
8 changes: 3 additions & 5 deletions charts/px-central/templates/px-backup/pxcentral-backup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ metadata:
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: px-backup-cluster-role
namespace: {{ .Release.Namespace }}
name: px-backup-cluster-role-{{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
{{- include "px-central.labels" . | nindent 4 }}
Expand Down Expand Up @@ -46,8 +45,7 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: px-backup-cluster-role-binding
namespace: {{ .Release.Namespace }}
name: px-backup-cluster-role-binding-{{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-apiserver
{{- include "px-central.labels" . | nindent 4 }}
Expand All @@ -57,7 +55,7 @@ subjects:
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: px-backup-cluster-role
name: px-backup-cluster-role-{{ .Release.Namespace }}
apiGroup: rbac.authorization.k8s.io
---
kind: Role
Expand Down
16 changes: 6 additions & 10 deletions charts/px-central/templates/px-backup/pxcentral-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: pxc-prometheus-operator
namespace: {{ .Release.Namespace }}
name: pxc-prometheus-operator-{{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
{{- include "px-central.labels" . | nindent 4 }}
Expand All @@ -40,13 +39,12 @@ subjects:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: pxc-prometheus-operator
name: pxc-prometheus-operator-{{ .Release.Namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: pxc-prometheus-operator
namespace: {{ .Release.Namespace }}
name: pxc-prometheus-operator-{{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
{{- include "px-central.labels" . | nindent 4 }}
Expand Down Expand Up @@ -187,8 +185,7 @@ spec:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: px-backup-dashboard-prometheus
namespace: {{ .Release.Namespace }}
name: px-backup-dashboard-prometheus-{{ .Release.Namespace }}
labels:
app.kubernetes.io/component: px-backup
{{- include "px-central.labels" . | nindent 4 }}
Expand Down Expand Up @@ -219,15 +216,14 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: px-backup-dashboard-prometheus
namespace: {{ .Release.Namespace }}
name: px-backup-dashboard-prometheus-{{ .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-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: px-backup-dashboard-prometheus
Expand Down
8 changes: 3 additions & 5 deletions charts/px-central/templates/px-lighthouse/pxcentral-api-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ roleRef:
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Release.Name | quote }}
namespace: {{ .Release.Namespace }}
name: {{ printf "%s-%s" .Release.Name .Release.Namespace | quote }}
labels:
app.kubernetes.io/component: pxcentral-apiserver
{{- include "px-central.labels" . | nindent 4 }}
Expand All @@ -59,8 +58,7 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Release.Name | quote }}
namespace: {{ .Release.Namespace }}
name: {{ printf "%s-%s" .Release.Name .Release.Namespace | quote }}
labels:
app.kubernetes.io/component: pxcentral-apiserver
{{- include "px-central.labels" . | nindent 4 }}
Expand All @@ -70,7 +68,7 @@ subjects:
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: {{ .Release.Name | quote }}
name: {{ printf "%s-%s" .Release.Name .Release.Namespace | quote }}
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
Expand Down
16 changes: 6 additions & 10 deletions charts/px-central/templates/px-monitor/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: pxcentral-prometheus
namespace: {{ .Release.Namespace }}
name: pxcentral-prometheus-{{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-prometheus
{{- include "px-central.labels" . | nindent 4 }}
Expand All @@ -50,15 +49,14 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: pxcentral-prometheus
namespace: {{ .Release.Namespace }}
name: pxcentral-prometheus-{{ .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-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: pxcentral-prometheus
Expand Down Expand Up @@ -207,8 +205,7 @@ spec:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: pxcentral-prometheus-operator
namespace: {{ .Release.Namespace }}
name: pxcentral-prometheus-operator-{{ .Release.Namespace }}
labels:
app.kubernetes.io/component: pxcentral-prometheus
{{- include "px-central.labels" . | nindent 4 }}
Expand Down Expand Up @@ -269,15 +266,14 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: pxcentral-prometheus-operator
namespace: {{ .Release.Namespace }}
name: pxcentral-prometheus-operator-{{ .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-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: pxcentral-prometheus-operator
Expand Down