[stable/prometheus-operator] Prometheus operator version updates (hel…

…m#10684)

* Updated grafana dep for extraConfigmapMounts, kube-state-metrics for psp

Signed-off-by: Derek Heldt-Werle <derek.heldt-werle@viasat.com>

* Added newly supported options to both the README and values.yaml file

Signed-off-by: Derek Heldt-Werle <derek.heldt-werle@viasat.com>

* Bump version number

Signed-off-by: Derek Heldt-Werle <derek.heldt-werle@viasat.com>
Signed-off-by: Syed Imam <syedimam0012@gmail.com>

stable/prometheus-operator/Chart.yaml

@@ -9,7 +9,7 @@ name: prometheus-operator
 sources:
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 1.8.1
+version: 1.9.0
 appVersion: 0.26.0
 home: https://github.com/coreos/prometheus-operator
 keywords:

stable/prometheus-operator/README.md

@@ -228,6 +228,7 @@ The following tables lists the configurable parameters of the prometheus-operato
 | `grafana.sidecar.datasources.enabled` | Enable the Grafana sidecar to automatically load dashboards with a label `{{ grafana.sidecar.datasources.label }}=1` | `true` |
 | `grafana.sidecar.datasources.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as datasources configurations | `grafana_datasource` |
 | `grafana.rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires rbac.pspEnabled) | `true` |
+| `grafana.extraConfigmapMounts` | Additional grafana server configMap volume mounts | `[]` |
 
 ### Exporters
 | Parameter | Description | Default |
@@ -269,6 +270,7 @@ The following tables lists the configurable parameters of the prometheus-operato
 | `kubeScheduler.service.targetPort.selector` | Scheduler service selector | `{"k8s-app" : "kube-scheduler" }`
 | `kubeStateMetrics.enabled` | Deploy the `kube-state-metrics` chart and configure a servicemonitor to scrape | `true` |
 | `kube-state-metrics.rbac.create` | Create RBAC components in kube-state-metrics. See `global.rbac.create` | `true` |
+| `kube-state-metrics.podSecurityPolicy.enabled` | Create pod security policy resource for kube-state-metrics. | `true` |
 | `nodeExporter.enabled` | Deploy the `prometheus-node-exporter` and scrape it | `true` |
 | `nodeExporter.jobLabel` | The name of the label on the target service to use as the job name in prometheus. See `prometheus-node-exporter.podLabels.jobLabel=node-exporter` default | `jobLabel` |
 | `prometheus-node-exporter.podLabels` | Additional labels for pods in the DaemonSet | `{"jobLabel":"node-exporter"}` |

stable/prometheus-operator/requirements.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: kube-state-metrics
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.12.1
+  version: 0.13.0
 - name: prometheus-node-exporter
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 1.1.0
 - name: grafana
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.24.2
-digest: sha256:d7c161ede3f397ea69b587691ff66b259c9ff4cf4744dd88a02c8db442db986b
-generated: 2019-01-14T16:40:33.892687423+01:00
+  version: 1.25.0
+digest: sha256:db064dc47d3363e31d6e317385b29bffc30929ed42a0d2951109184e907721e2
+generated: 2019-01-15T16:00:38.946498-08:00

stable/prometheus-operator/requirements.yaml

@@ -1,7 +1,7 @@
 dependencies:
 
   - name: kube-state-metrics
-    version: 0.12.*
+    version: 0.13.*
     repository: https://kubernetes-charts.storage.googleapis.com/
     condition: kubeStateMetrics.enabled
 
@@ -11,6 +11,6 @@ dependencies:
     condition: nodeExporter.enabled
 
   - name: grafana
-    version: 1.24.*
+    version: 1.25.*
     repository: https://kubernetes-charts.storage.googleapis.com/
     condition: grafana.enabled

stable/prometheus-operator/values.yaml

@@ -324,6 +324,13 @@ grafana:
       enabled: true
       label: grafana_datasource
 
+  extraConfigmapMounts: []
+  # - name: certs-configmap
+  #   mountPath: /etc/grafana/ssl/
+  #   configMap: certs-configmap
+  #   readOnly: true
+
+
 ## Component scraping the kube api server
 ##
 kubeApiServer:
@@ -457,6 +464,8 @@ kubeStateMetrics:
 kube-state-metrics:
   rbac:
     create: true
+  podSecurityPolicy:
+    enabled: true
 
 ## Deploy node exporter as a daemonset to all nodes
 ##