Merge pull request #2109 from aiyengar2/fix-disable-grafana

[rancher-monitoring] Fix deployment error when installing rancher-monitoring without grafana

charts/rancher-monitoring/101.0.0+up19.0.3/templates/rancher-monitoring/clusterrole.yaml

@@ -113,8 +113,10 @@ rules:
   - "https:{{ template "kube-prometheus-stack.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}"
   - "http:{{ template "kube-prometheus-stack.fullname" . }}-alertmanager:{{ .Values.alertmanager.service.port }}"
   - "https:{{ template "kube-prometheus-stack.fullname" . }}-alertmanager:{{ .Values.alertmanager.service.port }}"
+{{- if .Values.grafana.enabled }}
   - "http:{{ include "call-nested" (list . "grafana" "grafana.fullname") }}:{{ .Values.grafana.service.port }}"
   - "https:{{ include "call-nested" (list . "grafana" "grafana.fullname") }}:{{ .Values.grafana.service.port }}"
+{{- end }}
   verbs:
   - 'get'
 - apiGroups:
@@ -122,7 +124,9 @@ rules:
   resourceNames:
   - {{ template "kube-prometheus-stack.fullname" . }}-prometheus
   - {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
+{{- if .Values.grafana.enabled }}
   - {{ include "call-nested" (list . "grafana" "grafana.fullname") }}
+{{- end }}
   resources:
   - endpoints
   verbs:

index.yaml

@@ -6574,7 +6574,7 @@ entries:
       catalog.cattle.io/upstream-version: 19.0.3
     apiVersion: v2
     appVersion: 0.50.0
-    created: "2022-09-20T12:23:06.658341-07:00"
+    created: "2022-09-22T14:33:54.306221-07:00"
     dependencies:
     - condition: grafana.enabled
       name: grafana
@@ -6645,7 +6645,7 @@ entries:
     description: Collects several related Helm charts, Grafana dashboards, and Prometheus
       rules combined with documentation and scripts to provide easy to operate end-to-end
       Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
-    digest: b156ee4af793f838001ad2fef84d9a611fdee13cc70e9d8c5922c43e7819de90
+    digest: 85f6118717ec0473d0fd9101441a9613fbf5e950af32388c4d2a7b6a195de48a
     home: https://github.com/prometheus-operator/kube-prometheus
     icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
     keywords:

packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/templates/rancher-monitoring/clusterrole.yaml

@@ -113,8 +113,10 @@ rules:
   - "https:{{ template "kube-prometheus-stack.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}"
   - "http:{{ template "kube-prometheus-stack.fullname" . }}-alertmanager:{{ .Values.alertmanager.service.port }}"
   - "https:{{ template "kube-prometheus-stack.fullname" . }}-alertmanager:{{ .Values.alertmanager.service.port }}"
+{{- if .Values.grafana.enabled }}
   - "http:{{ include "call-nested" (list . "grafana" "grafana.fullname") }}:{{ .Values.grafana.service.port }}"
   - "https:{{ include "call-nested" (list . "grafana" "grafana.fullname") }}:{{ .Values.grafana.service.port }}"
+{{- end }}
   verbs:
   - 'get'
 - apiGroups:
@@ -122,7 +124,9 @@ rules:
   resourceNames:
   - {{ template "kube-prometheus-stack.fullname" . }}-prometheus
   - {{ template "kube-prometheus-stack.fullname" . }}-alertmanager
+{{- if .Values.grafana.enabled }}
   - {{ include "call-nested" (list . "grafana" "grafana.fullname") }}
+{{- end }}
   resources:
   - endpoints
   verbs: