Helm: fix invalid value name for telemetry.serviceMonitor.enabled (#786)

Corrects an issue introduced in #778

Author: benashz

chart/values.yaml

@@ -721,7 +721,7 @@ telemetry:
 
     # Enable deployment of the Vault Secrets Operator ServiceMonitor CustomResource.
     # @type: boolean
-    nabled: false
+    enabled: false
 
     # Selector labels to add to the ServiceMonitor.
     # When empty, defaults to:

test/unit/prometheus-servicemonitor.bats

@@ -2,87 +2,90 @@
 
 load _helpers
 
-@test "prometheus/ServiceMonitor-server: assertDisabled by default" {
+@test "prometheus/ServiceMonitor-server: assertDisabled in values" {
   cd `chart_dir`
-  local actual=$( (helm template \
-      --show-only templates/prometheus-servicemonitor.yaml  \
-      . || echo "---") | tee /dev/stderr |
-      yq 'length > 0' | tee /dev/stderr)
-  [ "${actual}" = "false" ]
+  local actual=$(cat values.yaml | yq '.telemetry.serviceMonitor.enabled' | tee /dev/stderr)
+    [ "${actual}" == "false" ]
 }
 
+@test "prometheus/ServiceMonitor-server: assertDisabled by default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      . | tee /dev/stderr |
+      yq 'select(.kind == "ServiceMonitor" and .metadata.labels."control-plane" == "controller-manager") | documentIndex' | tee /dev/stderr)
+  [ "${actual}" = "" ]
+}
 
 @test "prometheus/ServiceMonitor-server: assertEnabled" {
   cd `chart_dir`
-  local actual=$( (helm template \
-      --show-only templates/prometheus-servicemonitor.yaml  \
+  local actual=$(helm template \
       --set 'telemetry.serviceMonitor.enabled=true' \
-      . || echo "---") | tee /dev/stderr |
-      yq 'length > 0' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
+      . | tee /dev/stderr |
+      yq 'select(.kind == "ServiceMonitor" and .metadata.labels."control-plane" == "controller-manager") | documentIndex' | tee /dev/stderr)
+  [ "${actual}" -ge 0 ]
 }
 
 @test "prometheus/ServiceMonitor-server: assertScrapeTimeout default" {
   cd `chart_dir`
-  local actual=$( (helm template \
-      --show-only templates/prometheus-servicemonitor.yaml \
+  local actual=$(helm template \
       --set 'telemetry.serviceMonitor.enabled=true' \
-      . ) | tee /dev/stderr |
+      --show-only templates/prometheus-servicemonitor.yaml \
+      .  | tee /dev/stderr |
       yq -r '.spec.endpoints[0].scrapeTimeout' | tee /dev/stderr)
   [ "${actual}" = "10s" ]
 }
 
 @test "prometheus/ServiceMonitor-server: assertScrapeTimeout update" {
   cd `chart_dir`
-  local actual=$( (helm template \
+  local actual=$(helm template \
       --show-only templates/prometheus-servicemonitor.yaml \
       --set 'telemetry.serviceMonitor.enabled=true' \
       --set 'telemetry.serviceMonitor.scrapeTimeout=60s' \
-      . ) | tee /dev/stderr |
+      . | tee /dev/stderr |
       yq -r '.spec.endpoints[0].scrapeTimeout' | tee /dev/stderr)
   [ "${actual}" = "60s" ]
 }
 
 @test "prometheus/ServiceMonitor-server: assertInterval default" {
   cd `chart_dir`
-  local actual=$( (helm template \
+  local actual=$(helm template \
       --show-only templates/prometheus-servicemonitor.yaml \
       --set 'telemetry.serviceMonitor.enabled=true' \
-      . ) | tee /dev/stderr |
+      . | tee /dev/stderr |
       yq -r '.spec.endpoints[0].interval' | tee /dev/stderr)
   [ "${actual}" = "30s" ]
 }
 
 @test "prometheus/ServiceMonitor-server: assertInterval update" {
   cd `chart_dir`
-  local actual=$( (helm template \
+  local actual=$(helm template \
       --show-only templates/prometheus-servicemonitor.yaml \
       --set 'telemetry.serviceMonitor.enabled=true' \
       --set 'telemetry.serviceMonitor.interval=60s' \
-      . )  | tee /dev/stderr |
+      . | tee /dev/stderr |
       yq -r '.spec.endpoints[0].interval' | tee /dev/stderr)
   [ "${actual}" = "60s" ]
 }
 
 @test "prometheus/ServiceMonitor-server: assertSelectors default" {
   cd `chart_dir`
-  local output=$( (helm template \
+  local output=$(helm template \
       --show-only templates/prometheus-servicemonitor.yaml \
       --set 'telemetry.serviceMonitor.enabled=true' \
-      . ) | tee /dev/stderr)
+      .  | tee /dev/stderr)
 
   [ "$(echo "$output" | yq -r '.metadata.labels | length')" = "7" ]
   [ "$(echo "$output" | yq -r '.metadata.labels.control-plane')" = "controller-manager" ]
 }
 
 @test "prometheus/ServiceMonitor-server: assertSelectors override" {
   cd `chart_dir`
-  local output=$( (helm template \
+  local output=$(helm template \
       --show-only templates/prometheus-servicemonitor.yaml \
       --set 'telemetry.serviceMonitor.enabled=true' \
       --set 'telemetry.serviceMonitor.selectors.baz=qux' \
       --set 'telemetry.serviceMonitor.selectors.bar=foo' \
-      . ) | tee /dev/stderr)
+      . | tee /dev/stderr)
 
   [ "$(echo "$output" | yq -r '.metadata.labels | length')" = "9" ]
   [ "$(echo "$output" | yq -r '.metadata.labels | has("app")')" = "false" ]
@@ -92,10 +95,10 @@ load _helpers
 
 @test "prometheus/ServiceMonitor-server: assertEndpoints default" {
   cd `chart_dir`
-  local output=$( (helm template \
+  local output=$(helm template \
       --show-only templates/prometheus-servicemonitor.yaml \
       --set 'telemetry.serviceMonitor.enabled=true' \
-      . ) | tee /dev/stderr)
+      . | tee /dev/stderr)
 
   [ "$(echo "$output" | yq -r '.spec.endpoints | length')" = "1" ]
   [ "$(echo "$output" | yq -r '.spec.endpoints[0].scheme')" = "https" ]
@@ -105,13 +108,13 @@ load _helpers
 
 @test "prometheus/ServiceMonitor-server: assertEndpoints update" {
   cd `chart_dir`
-  local output=$( (helm template \
+  local output=$(helm template \
       --show-only templates/prometheus-servicemonitor.yaml \
       --set 'telemetry.serviceMonitor.enabled=true' \
       --set 'telemetry.serviceMonitor.scheme=http' \
       --set 'telemetry.serviceMonitor.port=http' \
       --set 'telemetry.serviceMonitor.bearerTokenFile=/foo/token' \
-      . ) | tee /dev/stderr)
+      . | tee /dev/stderr)
 
   [ "$(echo "$output" | yq -r '.spec.endpoints | length')" = "1" ]
   [ "$(echo "$output" | yq -r '.spec.endpoints[0].scheme')" = "http" ]