.gitlab-ci.yml

@@ -161,10 +161,10 @@ test-helm:
     - cd helm
     - helm dependencies update .
     - helm install theodolite . -f preconfigs/minimal.yaml --wait
-    - helm test theodolite
     - kubectl get nodes -o wide
     - kubectl get pods --all-namespaces -o wide
     - kubectl get services --all-namespaces -o wide
+    - helm test theodolite
   after_script:
     - k3d cluster delete $CLUSTERNAME
 

helm/benchmark-definitions

-../theodolite-benchmarks/definitions/
\ No newline at end of file

helm/benchmark-definitions/examples

+../../theodolite/examples/operator/
\ No newline at end of file

helm/benchmark-definitions/test/test-example-execution.yaml

+apiVersion: theodolite.com/v1
+kind: execution
+metadata:
+  name: theodolite-test-execution
+spec:
+  benchmark: "example-benchmark"
+  loads:
+    loadType: "NumSensors"
+    loadValues: [100]
+  resources:
+    resourceType: "Instances"
+    resourceValues: [1]
+  slos:
+    - name: "lag trend"
+      properties:
+        warmup: 0 # in seconds
+  execution:
+    strategy:
+      name: "RestrictionSearch"
+      restrictions:
+        - "LowerBound"
+      searchStrategy: "LinearSearch"
+    duration: 60 # in seconds
+    repetitions: 1
+    loadGenerationDelay: 0 # in seconds
+  configOverrides: []

helm/benchmark-definitions/theodolite-benchmarks

+../../theodolite-benchmarks/definitions/
\ No newline at end of file

helm/templates/tests/test-prometheus-connection.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "theodolite.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   containers:
     - name: wget

helm/templates/tests/test-theodolite-example.yaml

+{{- if .Values.operator.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "theodolite.fullname" . }}-test-example-files"
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
+data:
+{{ ($.Files.Glob "benchmark-definitions/examples/*").AsConfig | indent 2 }}
+{{ ($.Files.Glob "benchmark-definitions/test/*").AsConfig | indent 2 }}
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "theodolite.fullname" . }}-test-example"
+  labels:
+    {{- include "theodolite.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  restartPolicy: Never
+  containers:
+    - name: kubectl
+      image: bitnami/kubectl
+      command:
+        - bash
+        - -c
+        - |
+          cd /example-resources/
+          kubectl apply -f example-configmap.yaml
+          kubectl apply -f example-benchmark.yaml
+          kubectl apply -f test-example-execution.yaml
+          timeout 180s bash -c "until kubectl get exec theodolite-test-execution -o json | jq -r .status.executionState | grep -i '^Finished$'; do kubectl get exec theodolite-test-execution -o json | jq -r .status.executionState; sleep 5s; done"
+          RETURN=$?
+          echo "RETURN: $RETURN"
+          kubectl delete -f example-configmap.yaml
+          kubectl delete -f example-benchmark.yaml
+          kubectl delete -f test-example-execution.yaml
+          exit $RETURN
+      volumeMounts:
+        - name: example-resources
+          mountPath: /example-resources
+  volumes:
+    - name: example-resources
+      configMap:
+        name: "{{ include "theodolite.fullname" . }}-test-example-files"
+  serviceAccountName:  {{ include "theodolite.serviceAccountName" . }}
+{{- end }}

helm/templates/theodolite/benchmarks/benchmark-resources-config-map.yaml

@@ -6,7 +6,7 @@ kind: ConfigMap
 metadata:
   name: benchmark-resources-{{ $name }}
 data:
-{{ ($.Files.Glob (printf "benchmark-definitions/%s/resources/*" $name)).AsConfig | indent 2 }}
+{{ ($.Files.Glob (printf "benchmark-definitions/theodolite-benchmarks/%s/resources/*" $name)).AsConfig | indent 2 }}
 ---
 {{- end }}
 {{- end }}

helm/templates/theodolite/benchmarks/benchmark.yaml

 {{- range $benchmark, $enabled := .Values.operator.theodoliteBenchmarks.benchmarks }}
 {{- if $enabled -}}
 {{- $name := kebabcase $benchmark }}
-{{ $.Files.Get (printf "benchmark-definitions/%s/%s-benchmark-operator.yaml" $name $name) }}
+{{ $.Files.Get (printf "benchmark-definitions/theodolite-benchmarks/%s/%s-benchmark-operator.yaml" $name $name) }}
 ---
 {{- end }}
 {{- end }}