Fix tests

Author: attilaedelenyi

charts/ontoserver-extras/tests/varnish_deployment_test.yaml

@@ -42,9 +42,10 @@ tests:
           path: spec.template.spec.containers[0].command
           content: "malloc,1g"
 
-  - it: includes metrics exporter container by default when varnish enabled
+  - it: includes metrics exporter container when metrics enabled
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - equal:
           path: spec.template.spec.containers[1].name
@@ -53,6 +54,7 @@ tests:
   - it: uses exporter image from values
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
       varnish.exporterImage: ghcr.io/aehrc/varnish-exporter:test
     asserts:
       - equal:
@@ -75,10 +77,10 @@ tests:
       varnish.opentelemetry.collectorEndpoint: "http://collector/api/v2/spans"
     asserts:
       - equal:
-          path: spec.template.spec.containers[2].name
+          path: spec.template.spec.containers[1].name
           value: varnish-trace-converter
       - equal:
-          path: spec.template.spec.containers[3].name
+          path: spec.template.spec.containers[2].name
           value: trace-forwarder
 
   - it: adds init container when otel enabled
@@ -97,7 +99,7 @@ tests:
     asserts:
       - lengthEqual:
           path: spec.template.spec.containers
-          count: 2
+          count: 1
 
   - it: sets trace-pipe volume when otel enabled
     set:
@@ -171,8 +173,8 @@ tests:
       varnish.opentelemetry.collectorEndpoint: "http://zipkin:9411/api/v2/spans"
     asserts:
       - equal:
-          path: spec.template.spec.containers[3].env[0].name
+          path: spec.template.spec.containers[2].env[0].name
           value: COLLECTOR_URL
       - equal:
-          path: spec.template.spec.containers[3].env[0].value
+          path: spec.template.spec.containers[2].env[0].value
           value: "http://zipkin:9411/api/v2/spans"

charts/ontoserver-extras/tests/varnish_metrics_test.yaml

@@ -18,6 +18,7 @@ tests:
   - it: renders prometheus-service when varnish and metrics enabled
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - isKind:
           of: Service
@@ -27,6 +28,7 @@ tests:
   - it: names prometheus service correctly
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - equal:
           path: metadata.name
@@ -35,6 +37,7 @@ tests:
   - it: exposes port 9131
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - equal:
           path: spec.ports[0].port
@@ -43,6 +46,7 @@ tests:
   - it: sets component label for metrics
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - equal:
           path: metadata.labels["app.kubernetes.io/component"]

charts/ontoserver-extras/tests/varnish_service_test.yaml

@@ -20,6 +20,7 @@ tests:
   - it: renders prometheus-service when varnish and metrics enabled
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     template: templates/varnish-prometheus-service.yaml
     asserts:
       - hasDocuments:
@@ -28,6 +29,7 @@ tests:
   - it: renders servicemonitor when varnish and metrics enabled
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     template: templates/varnish-servicemonitor.yaml
     asserts:
       - hasDocuments:

charts/ontoserver-extras/tests/varnish_servicemonitor_test.yaml

@@ -18,6 +18,7 @@ tests:
   - it: renders a ServiceMonitor when varnish and metrics enabled
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - isKind:
           of: ServiceMonitor
@@ -27,6 +28,7 @@ tests:
   - it: names the ServiceMonitor correctly
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - equal:
           path: metadata.name
@@ -35,6 +37,7 @@ tests:
   - it: uses metrics interval from values
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
       varnish.metrics.interval: 30s
     asserts:
       - equal:
@@ -44,6 +47,7 @@ tests:
   - it: uses metrics scrapeTimeout from values
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
       varnish.metrics.scrapeTimeout: 25s
     asserts:
       - equal:
@@ -53,6 +57,7 @@ tests:
   - it: sets metrics endpoint port
     set:
       varnish.enabled: true
+      varnish.metrics.enabled: true
     asserts:
       - equal:
           path: spec.endpoints[0].port