Fixed Otel Controller - Auxiliares resources deletion

Makefile

@@ -198,7 +198,7 @@ generate: controller-gen
 # end-to-tests
 .PHONY: e2e
 e2e: chainsaw
-	$(CHAINSAW) test --test-dir ./tests/e2e
+	$(CHAINSAW) test --test-dir ./tests/e2e/ingress
 
 # end-to-end-test for testing autoscale
 .PHONY: e2e-autoscale
@@ -367,7 +367,7 @@ KUSTOMIZE_VERSION ?= v5.0.3
 CONTROLLER_TOOLS_VERSION ?= v0.12.0
 GOLANGCI_LINT_VERSION ?= v1.54.0
 KIND_VERSION ?= v0.20.0
-CHAINSAW_VERSION ?= v0.1.4
+CHAINSAW_VERSION ?= v0.1.7
 
 .PHONY: install-tools
 install-tools: kustomize golangci-lint kind controller-gen envtest crdoc kind operator-sdk chainsaw

tests/e2e/ingress/00-assert.yaml

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: simplest-collector
+  name: otel-simplest-collector
 status:
   readyReplicas: 1
 ---
@@ -13,29 +13,29 @@ metadata:
     something.com: "true"
   labels:
     app.kubernetes.io/managed-by: opentelemetry-operator
-    app.kubernetes.io/name: simplest-ingress
-  name: simplest-ingress
+    app.kubernetes.io/name: otel-simplest-ingress
+  name: otel-simplest-ingress
   ownerReferences:
   - apiVersion: opentelemetry.io/v1alpha1
     blockOwnerDeletion: true
     controller: true
     kind: OpenTelemetryCollector
-    name: simplest
+    name: otel-simplest
 spec:
   rules:
   - host: example.com
     http:
       paths:
       - backend:
           service:
-            name: simplest-collector
+            name: otel-simplest-collector
             port:
               name: otlp-grpc
         path: /otlp-grpc
         pathType: Prefix
       - backend:
           service:
-            name: simplest-collector
+            name: otel-simplest-collector
             port:
               name: otlp-http
         path: /otlp-http

tests/e2e/ingress/00-install.yaml

@@ -2,9 +2,9 @@
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:
-  name: simplest
+  name: otel-simplest
 spec:
-  mode: "deployment"
+  mode: deployment
   ingress:
     type: ingress
     hostname: "example.com"

tests/e2e/ingress/01-error.yaml

@@ -6,29 +6,29 @@ metadata:
     something.com: "true"
   labels:
     app.kubernetes.io/managed-by: opentelemetry-operator
-    app.kubernetes.io/name: simplest-ingress
-  name: simplest-ingress
+    app.kubernetes.io/name: otel-simplest-ingress
+  name: otel-simplest-ingress
   ownerReferences:
     - apiVersion: opentelemetry.io/v1alpha1
       blockOwnerDeletion: true
       controller: true
       kind: OpenTelemetryCollector
-      name: simplest
+      name: otel-simplest
 spec:
   rules:
     - host: example.com
       http:
         paths:
           - backend:
               service:
-                name: simplest-collector
+                name: otel-simplest-collector
                 port:
                   name: otlp-grpc
             path: /otlp-grpc
             pathType: Prefix
           - backend:
               service:
-                name: simplest-collector
+                name: otel-simplest-collector
                 port:
                   name: otlp-http
             path: /otlp-http

tests/e2e/ingress/01-install.yaml → tests/e2e/ingress/01-remove-ingress.yaml

@@ -2,9 +2,10 @@
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:
-  name: simplest
+  name: otel-simplest
 spec:
-  mode: "deployment"
+  mode: deployment
+  ingress: ~
   config: |
     receivers:
       otlp:

tests/e2e/ingress/chainsaw-test.yaml

@@ -2,9 +2,15 @@
 apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
-  creationTimestamp: null
   name: ingress
 spec:
+  skip: false
+  concurrent: false
+  skipDelete: false
+  timeouts:
+    apply: 10s
+    assert: 10s
+    error: 10s
   steps:
     - name: step-00
       try:
@@ -15,9 +21,7 @@ spec:
     # Applying the same OpenTelemetryCollector from the previous step, but this time without the spec.ingress, which should inform the controller to delete the ingress resource. So, we should get an error checking if the ingress still exists.
     - name: step-01
       try:
-        - apply:
-            file: 01-install.yaml
-        - sleep:
-            duration: 5s
-        - error:
-            file: 01-error.yaml
+      - patch:
+          file: 01-remove-ingress.yaml
+      - error:
+          file: 01-error.yaml