Work around bug in Grafana subchart (#52)

* Pin to last known good patch versions of dependency charts

* Set ENFORCE_CACHE_LABELS=off on grafana-operator

grafana/grafana-operator#1971

* Add additional logging to smoke test failures

Author: christian-stephen

.circleci/config.yml

@@ -248,6 +248,14 @@ jobs:
           name: Describe Pods on failure
           command: kubectl describe pods & exit 1
           when: on_fail
+      - run:
+          name: Describe Prometheus on failure
+          command: kubectl describe prometheus & exit 1
+          when: on_fail
+      - run:
+          name: Describe Grafana on failure
+          command: kubectl describe grafana & exit 1
+          when: on_fail
       - run:
           name: Uninstall Helm chart
           command: helm uninstall server-monitoring-stack -n server-monitoring

Chart.yaml

@@ -4,12 +4,12 @@ description: A reference Helm chart for setting up a monitoring stack for Circle
 version: 0.1.0-alpha.3
 dependencies:
   - name: prometheus-operator-crds
-    version: 19.0.*
+    version: 19.0.0
     repository: "https://prometheus-community.github.io/helm-charts"
     condition: prometheusOperator.installCRDs
     alias: prometheusOperator
   - name: grafana-operator
-    version: 5.17.*
+    version: 5.17.1
     repository: "https://grafana.github.io/helm-charts"
     alias: grafanaoperator
     condition: grafanaoperator.enabled

README.md

@@ -24,8 +24,8 @@ A reference Helm chart for setting up a monitoring stack for CircleCI server
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://grafana.github.io/helm-charts | grafanaoperator(grafana-operator) | 5.17.* |
-| https://prometheus-community.github.io/helm-charts | prometheusOperator(prometheus-operator-crds) | 19.0.* |
+| https://grafana.github.io/helm-charts | grafanaoperator(grafana-operator) | 5.17.1 |
+| https://prometheus-community.github.io/helm-charts | prometheusOperator(prometheus-operator-crds) | 19.0.0 |
 
 ### 1. Configure Server for the Monitoring Stack
 
@@ -184,7 +184,7 @@ Dashboards are provisioned directly from CRDs, which means any manual edits will
 | grafana.service.annotations | object | `{}` | Metadata annotations for the service. |
 | grafana.service.port | int | `3000` | Port on which the Grafana service will be exposed. |
 | grafana.service.type | string | `"ClusterIP"` | Specifies the type of service for Grafana. Options include ClusterIP, NodePort, or LoadBalancer. Use NodePort or LoadBalancer to expose Grafana externally. Ensure that grafana.credentials are set for security purposes. |
-| grafanaoperator | object | `{"fullnameOverride":"server-monitoring-grafana-operator","image":{"repository":"quay.io/grafana-operator/grafana-operator","tag":"v5.17.0"}}` | Full values for the Grafana Operator chart can be obtained at: https://github.com/grafana/grafana-operator/blob/master/deploy/helm/grafana-operator/values.yaml |
+| grafanaoperator | object | `{"env":[{"name":"ENFORCE_CACHE_LABELS","value":"off"}],"fullnameOverride":"server-monitoring-grafana-operator","image":{"repository":"quay.io/grafana-operator/grafana-operator","tag":"v5.17.0"}}` | Full values for the Grafana Operator chart can be obtained at: https://github.com/grafana/grafana-operator/blob/master/deploy/helm/grafana-operator/values.yaml |
 | grafanaoperator.fullnameOverride | string | `"server-monitoring-grafana-operator"` | Overrides the fully qualified app name. |
 | grafanaoperator.image.repository | string | `"quay.io/grafana-operator/grafana-operator"` | Image repository for the Grafana Operator. |
 | grafanaoperator.image.tag | string | `"v5.17.0"` | Tag for the Grafana Operator image. |

values.yaml

@@ -81,6 +81,10 @@ grafanaoperator:
     repository: quay.io/grafana-operator/grafana-operator
     # -- Tag for the Grafana Operator image.
     tag: v5.17.0
+  env:
+    # https://github.com/grafana/grafana-operator/issues/1971
+    - name: ENFORCE_CACHE_LABELS
+      value: "off"
 
 grafana:
   enabled: "-"