Skip to content

Commit 6091430

Browse files
avishnuavishnu
authored
Merge pull request #103 from datacore-vvarakantham/pr-96
Disable psp for kube-prometheus stack - PR-96
2 parents 2961cdf + 3a9effc commit 6091430

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

‎deploy/charts/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ keywords:
3434
# This is the chart version. This version number should be incremented each time you make changes
3535
# to the chart and its templates, including the app version.
3636
# Versions are expected to follow Semantic Versioning (https://semver.org/)
37-
version: 0.4.11
37+
version: 0.4.12
3838

3939
# This is the version number of the application being deployed. This version number should be
4040
# incremented each time you make changes to the application. Versions are not expected to

‎deploy/charts/README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,26 @@ The following table lists the configurable parameters of the OpenEBS monitoring
7676

7777
You can modify different parameters by specifying the desired value in the `helm install` command by using the `--set` and/or the `--set-string` flag(s). You can modify the parameters of the [kube-prometheus-stack chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) by adding `kube-prometheus-stack` before the desired parameter in the `helm install` command.
7878

79-
In the following sample command we modify `serviceMonitors.cstor.enabled` from the openebs-monitoring chart and `kube-prometheus-stack.kubeProxy.enabled` from the kube-prometheus-stack chart to disable monitoring for cstor volumes and kube-proxy.
79+
In the following sample command we modify `openebsMonitoringAddon.cStor.enabled` from the openebs-monitoring chart and `kube-prometheus-stack.kubeProxy.enabled` from the kube-prometheus-stack chart to disable monitoring for cstor and kube-proxy.
8080

8181
```console
8282
helm install openebs-monitoring openebs-monitoring/monitoring --namespace openebs-monitoring --create-namespace \
83-
--set serviceMonitors.cstor.enabled=false \
83+
--set openebsMonitoringAddon.cStor.enabled=false \
8484
--set kube-prometheus-stack.kubeProxy.enabled=false
8585
```
8686

8787
| Parameter | Description | Default |
8888
| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------- |
89+
| `kube-prometheus-stack.global.rbac.pspEnabled` | Disable PSP for alertmanager, prometheus and prometheus-operator | `false` |
90+
| `kube-prometheus-stack.kube-state-metrics.podSecurityPolicy.enabled` | Disable PSP for kube-state-metrics | `false` |
8991
| `kube-prometheus-stack.prometheus.service.type` | Service type for Prometheus | `"NodePort"` |
9092
| `kube-prometheus-stack.prometheus.service.nodePort` | NodePort value for Prometheus service | `32514` |
9193
| `kube-prometheus-stack.prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues` | Enables Prometheus to select every service monitors | `false` |
9294
| `kube-prometheus-stack.prometheus.prometheusSpec.podMonitorSelectorNilUsesHelmValues` | Enables Prometheus to select every pod monitors | `false` |
9395
| `kube-prometheus-stack.prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues` | Enables Prometheus to select every Prometheus rules | `false` |
9496
| `kube-prometheus-stack.prometheus.prometheusSpec.replicas` | Number of instances to deploy for a Prometheus deployment | `1` |
9597
| `kube-prometheus-stack.prometheus.prometheusSpec.storageSpec` | Storage spec to specify how storage shall be used. | `{}` |
98+
| `kube-prometheus-stack.prometheus-node-exporter.rbac.pspEnabled` | Disable PSP for node-exporter | `false` |
9699
| `kube-prometheus-stack.prometheus-node-exporter.securityContext` | Privilege and access control settings for node-exporter | `{...}` |
97100
| `kube-prometheus-stack.prometheus-node-exporter.extraArgs` | Additional container arguments | `[...]` |
98101
| `kube-prometheus-stack.alertmanager.enabled` | Deploy Alertmanager | `true` |
@@ -102,7 +105,8 @@ helm install openebs-monitoring openebs-monitoring/monitoring --namespace openeb
102105
| `kube-prometheus-stack.alertmanager.alertmanagerSpec.replicas` | Number of instances to deploy for a Alertmanager deployment | `1` |
103106
| `kube-prometheus-stack.alertmanager.alertmanagerSpec.storage` | Storage is the definition of how storage will be used by the Alertmanager instances | `{}` |
104107
| `kube-prometheus-stack.prometheusOperator.enabled` | Deploy Prometheus Operator | `true` |
105-
| `kube-prometheus-stack.grafana.enabled` | Enables monitoring of Grafana itself | `true` |
108+
| `kube-prometheus-stack.grafana.enabled` | Enables monitoring of grafana itself | `true` |
109+
| `kube-prometheus-stack.grafana.rbac.pspEnabled` | Disable PSP for grafana | `false` |
106110
| `kube-prometheus-stack.grafana.grafana.ini` | Append to Grafana's primary configuration | `{panels: {disable_sanitize_html: true}}` |
107111
| `kube-prometheus-stack.grafana.service.type` | Service type for Grafana | `"NodePort"` |
108112
| `kube-prometheus-stack.grafana.service.nodePort` | NodePort value for Grafana service | `32515` |

‎deploy/charts/values.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,19 @@ fullnameOverride: ""
1717
## Configuration for kube-prometheus-stack subchart
1818
kube-prometheus-stack:
1919
install: true
20+
21+
global:
22+
rbac:
23+
pspEnabled: false
24+
25+
kube-state-metrics:
26+
podSecurityPolicy:
27+
enabled: false
28+
2029
prometheus-node-exporter:
30+
rbac:
31+
pspEnabled: false
32+
2133
## privilege and access control settings for node-exporter
2234
securityContext:
2335
fsGroup: 65534
@@ -131,6 +143,9 @@ kube-prometheus-stack:
131143
grafana:
132144
enabled: true
133145

146+
rbac:
147+
pspEnabled: false
148+
134149
## In order to render HTML and Javascript in a text panel without being sanitized
135150
## enable the `disable_sanitize_html` settings in Grafana ini file
136151
grafana.ini:

0 commit comments

Comments
 (0)