test(e2e): remove templating mechanism for aut

dash0hq · Aug 22, 2024 · a2f47f7 · a2f47f7
1 parent 3e280e1
commit a2f47f7
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 20 deletions.
diff --git a/test-resources/bin/render-templates.sh b/test-resources/bin/render-templates.sh
@@ -10,10 +10,4 @@ cd "$(dirname ${BASH_SOURCE})"/../..
 source test-resources/bin/util
 load_env_file
 
-resource_types=( cronjob daemonset deployment job pod replicaset statefulset )
-
-for resource_type in "${resource_types[@]}"; do
-  cat test-resources/node.js/express/${resource_type}.yaml.template | envsubst > test-resources/node.js/express/${resource_type}.yaml
-done
-
 cat test-resources/customresources/dash0monitoring/dash0monitoring.token.yaml.template | DASH0_AUTHORIZATION_TOKEN="$DASH0_AUTHORIZATION_TOKEN" envsubst > test-resources/customresources/dash0monitoring/dash0monitoring.token.yaml
diff --git a/test-resources/node.js/express/.gitignore b/test-resources/node.js/express/.gitignore
@@ -1,8 +1 @@
-node_modules/
-cronjob.yaml
-daemonset.yaml
-deployment.yaml
-job.yaml
-pod.yaml
-replicaset.yaml
-statefulset.yaml
+node_modules/
diff --git a/test-resources/node.js/express/cronjob.yaml b/test-resources/node.js/express/cronjob.yaml
@@ -0,0 +1,30 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+    name: dash0-operator-nodejs-20-express-test-cronjob
+spec:
+    jobTemplate:
+        spec:
+            template:
+                spec:
+                    containers:
+                        - env:
+                            - name: PORT
+                              value: "1205"
+                            - name: DASH0_DEBUG
+                              value: "true"
+                            - name: TRIGGER_SELF_AND_EXIT
+                              value: "true"
+                          image: dash0-operator-nodejs-20-express-test-app:latest
+                          imagePullPolicy: Never
+                          name: dash0-operator-nodejs-20-express-test-cronjob-app
+                          ports:
+                            - containerPort: 1205
+                          readinessProbe:
+                            httpGet:
+                                path: /ready
+                                port: 1205
+                            initialDelaySeconds: 1
+                            periodSeconds: 1
+                    restartPolicy: Never
+    schedule: '* * * * *'
diff --git a/test-resources/node.js/express/daemonset.opt-out.yaml b/test-resources/node.js/express/daemonset.opt-out.yaml
@@ -39,4 +39,10 @@ spec:
               value: "true"
           ports:
             - containerPort: 1206
-          imagePullPolicy: Never
+          imagePullPolicy: Never
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: 1206
+            initialDelaySeconds: 1
+            periodSeconds: 1
diff --git a/...s/node.js/express/daemonset.yaml.template → ...-resources/node.js/express/daemonset.yaml b/...s/node.js/express/daemonset.yaml.template → ...-resources/node.js/express/daemonset.yaml
diff --git a/.../node.js/express/deployment.yaml.template → ...resources/node.js/express/deployment.yaml b/.../node.js/express/deployment.yaml.template → ...resources/node.js/express/deployment.yaml
diff --git a/...sources/node.js/express/job.yaml.template → test-resources/node.js/express/job.yaml b/...sources/node.js/express/job.yaml.template → test-resources/node.js/express/job.yaml
diff --git a/...sources/node.js/express/pod.yaml.template → test-resources/node.js/express/pod.yaml b/...sources/node.js/express/pod.yaml.template → test-resources/node.js/express/pod.yaml
@@ -32,8 +32,8 @@ spec:
         - containerPort: 1211
       imagePullPolicy: Never
       readinessProbe:
-	    httpGet:
-	      path: /ready
-	      port: 1211
-	    initialDelaySeconds: 1
-	    periodSeconds: 1
+        httpGet:
+          path: /ready
+          port: 1211
+        initialDelaySeconds: 1
+        periodSeconds: 1
diff --git a/.../node.js/express/replicaset.yaml.template → ...resources/node.js/express/replicaset.yaml b/.../node.js/express/replicaset.yaml.template → ...resources/node.js/express/replicaset.yaml
diff --git a/...node.js/express/statefulset.yaml.template → ...esources/node.js/express/statefulset.yaml b/...node.js/express/statefulset.yaml.template → ...esources/node.js/express/statefulset.yaml