Merge branch 'main' into fix/config-exporter-endpoint-panic

open-telemetry · Feb 21, 2024 · c261f9e · c261f9e
2 parents 1cda5fd + 699e034
commit c261f9e
Show file tree

Hide file tree

Showing 63 changed files with 488 additions and 297 deletions.
diff --git a/.chainsaw.yaml b/.chainsaw.yaml
@@ -6,7 +6,8 @@ metadata:
 spec:
   parallel: 4
   timeouts:
-    assert: 5m0s
+    assert: 6m0s
     cleanup: 5m0s
     delete: 5m0s
     error: 5m0s
+    apply: 10s
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -51,7 +51,7 @@ jobs:
         path: bin
         key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
     - name: Install chainsaw
-      uses: kyverno/action-install-chainsaw@v0.1.4
+      uses: kyverno/action-install-chainsaw@v0.1.6
     - name: Install tools
       run: make install-tools
     - name: Prepare e2e tests

diff --git a/Makefile b/Makefile
@@ -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.6
 
 .PHONY: install-tools
 install-tools: kustomize golangci-lint kind controller-gen envtest crdoc kind operator-sdk chainsaw

diff --git a/tests/e2e-autoscale/autoscale/02-install.yaml b/tests/e2e-autoscale/autoscale/02-install.yaml
@@ -15,7 +15,7 @@ spec:
             - --otlp-insecure
             # High duration to ensure the trace creation doesn't stop.
             # It'll be stopped in step 4
-            - --duration=1m
+            - --duration=6m
             - --workers=20
             - traces
       restartPolicy: Never

diff --git a/tests/e2e-instrumentation/instrumentation-apache-httpd/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-apache-httpd/chainsaw-test.yaml
@@ -4,14 +4,26 @@ kind: Test
 metadata:
   name: instrumentation-apache-httpd
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 3000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=3000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-dotnet-musl/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-musl/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-dotnet-musl
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 2000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=2000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-dotnet/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-dotnet/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-dotnet
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 2000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=2000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-go/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-go/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-go
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 0/0
-        openshift.io/sa.scc.supplemental-groups: 2000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=0/0
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=2000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-java-other-ns/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-java-other-ns
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 2000/1000
   steps:
   - name: step-01
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=2000/1000
+        - --overwrite
     - delete:
         ref:
           apiVersion: v1

diff --git a/tests/e2e-instrumentation/instrumentation-java/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-java/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-java
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 2000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=2000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-nginx-contnr-secctx
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 3000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=3000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-nginx-multicontainer
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 3000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=3000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-nginx/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-nginx/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-nginx
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 3000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=3000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-nodejs/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-nodejs/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-nodejs
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 2000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=2000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply:

diff --git a/tests/e2e-instrumentation/instrumentation-python/chainsaw-test.yaml b/tests/e2e-instrumentation/instrumentation-python/chainsaw-test.yaml
@@ -5,14 +5,26 @@ metadata:
   creationTimestamp: null
   name: instrumentation-python
 spec:
-  namespaceTemplate:
-    metadata:
-      annotations:
-        openshift.io/sa.scc.uid-range: 1000/1000
-        openshift.io/sa.scc.supplemental-groups: 2000/1000
   steps:
   - name: step-00
     try:
+    # In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.uid-range=1000/1000
+        - --overwrite
+    - command:
+        entrypoint: kubectl
+        args:
+        - annotate
+        - namespace
+        - ${NAMESPACE}
+        - openshift.io/sa.scc.supplemental-groups=2000/1000
+        - --overwrite
     - apply:
         file: 00-install-collector.yaml
     - apply: