multi-instrumentation

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

Author: eddycharly

.github/workflows/e2e.yaml

@@ -23,7 +23,7 @@ jobs:
        kube-version:
          - "1.23"
          - "1.29"
-       group:
+       group: []
         #  - e2e
         #  - e2e-instrumentation
         #  - e2e-upgrade
@@ -32,7 +32,7 @@ jobs:
         #  - e2e-opampbridge
         #  - e2e-prometheuscr
         #  - e2e-targetallocator
-         - e2e-multi-instrumentation
+        #  - e2e-multi-instrumentation
        include:
          - group: e2e-prometheuscr
            setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.observability.prometheus"
@@ -107,7 +107,7 @@ jobs:
          - e2e-prometheuscr
          - e2e-targetallocator
          - e2e-upgrade
-        #  - e2e-multi-instrumentation
+         - e2e-multi-instrumentation
        include:
          - group: e2e-prometheuscr
            setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.observability.prometheus"

Makefile

@@ -273,6 +273,11 @@ chainsaw-e2e-autoscale:
 chainsaw-e2e-instrumentation:
 	chainsaw test --test-dir ./tests/e2e-instrumentation
 
+# end-to-tests for multi-instrumentation
+.PHONY: chainsaw-e2e-multi-instrumentation
+chainsaw-e2e-multi-instrumentation:
+	chainsaw test --test-dir ./tests/e2e-multi-instrumentation
+
 # OpAMPBridge CR end-to-tests
 .PHONY: chainsaw-e2e-opampbridge
 chainsaw-e2e-opampbridge:

tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/chainsaw-test.yaml

@@ -0,0 +1,20 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  creationTimestamp: null
+  name: instrumentation-multi-multicontainer
+spec:
+  steps:
+  - name: step-00
+    try:
+    - apply:
+        file: 00-install-collector.yaml
+    - apply:
+        file: 00-install-instrumentation.yaml
+  - name: step-01
+    try:
+    - apply:
+        file: 01-install-app.yaml
+    - assert:
+        file: 01-assert.yaml

tests/e2e-multi-instrumentation/instrumentation-multi-no-containers/chainsaw-test.yaml

@@ -0,0 +1,20 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  creationTimestamp: null
+  name: instrumentation-multi-no-containers
+spec:
+  steps:
+  - name: step-00
+    try:
+    - apply:
+        file: 00-install-collector.yaml
+    - apply:
+        file: 00-install-instrumentation.yaml
+  - name: step-01
+    try:
+    - apply:
+        file: 01-install-app.yaml
+    - assert:
+        file: 01-assert.yaml

tests/e2e-multi-instrumentation/instrumentation-single-instr-first-container/chainsaw-test.yaml

@@ -0,0 +1,20 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  creationTimestamp: null
+  name: instrumentation-single-instr-first-container
+spec:
+  steps:
+  - name: step-00
+    try:
+    - apply:
+        file: 00-install-collector.yaml
+    - apply:
+        file: 00-install-instrumentation.yaml
+  - name: step-01
+    try:
+    - apply:
+        file: 01-install-app.yaml
+    - assert:
+        file: 01-assert.yaml