Merge branch 'main' into otel-ebpf-instrumentation

Author: NimrodAvni78

.github/workflows/collector-test.yaml

@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   collector-test:
     runs-on: ubuntu-latest

.github/workflows/demo-test.yaml

@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   demo-test:
     runs-on: ubuntu-latest

.github/workflows/ebpf-test.yaml

@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   ebpf-test:
     runs-on: ubuntu-latest

.github/workflows/kube-stack-test.yaml

@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   opentelemetry-kube-stack-test:
     runs-on: ubuntu-latest

.github/workflows/lint.yaml

@@ -5,6 +5,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   lint-test:
     runs-on: ubuntu-latest

.github/workflows/operator-test.yaml

@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   operator-test:
     runs-on: ubuntu-latest
@@ -65,7 +68,9 @@ jobs:
       - name: Run e2e tests
         working-directory: ./opentelemetry-operator
         # see https://github.com/open-telemetry/opentelemetry-helm-charts/issues/1180 for flaky test
-        run:  chainsaw test --test-dir ./tests/e2e --exclude-test-regex "chainsaw/multiple-configmaps" --exclude-test-regex "chainsaw/smoke-pod-dns-config"
+        run: |
+          mkdir -p ./.testresults/e2e
+          chainsaw test --test-dir ./tests/e2e --exclude-test-regex "chainsaw/multiple-configmaps" --exclude-test-regex "chainsaw/smoke-pod-dns-config" --exclude-test-regex "chainsaw/operator-metrics"
 
   operator-test-no-certmanager:
     runs-on: ubuntu-latest
@@ -119,4 +124,6 @@ jobs:
       - name: Run e2e tests
         working-directory: ./opentelemetry-operator
         # see https://github.com/open-telemetry/opentelemetry-helm-charts/issues/1180 for flaky test
-        run:  chainsaw test --test-dir ./tests/e2e --exclude-test-regex "chainsaw/multiple-configmaps" --exclude-test-regex "chainsaw/smoke-pod-dns-config"
+        run: |
+          mkdir -p ./.testresults/e2e
+          chainsaw test --test-dir ./tests/e2e --exclude-test-regex "chainsaw/multiple-configmaps" --exclude-test-regex "chainsaw/smoke-pod-dns-config" --exclude-test-regex "chainsaw/operator-metrics"

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
         with:
           sarif_file: results.sarif

.github/workflows/ta-test.yaml

@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   ta-test:
     runs-on: ubuntu-latest

Makefile

@@ -86,7 +86,7 @@ define get-crd
 @curl -s -o $(1) $(2)
 @sed -i '\#path: /convert#a {{ if .caBundle }}{{ cat "caBundle:" .caBundle | indent 8 }}{{ end }}' $(1)
 @sed -i 's#opentelemetry-operator-system/opentelemetry-operator-serving-cert#{{ include "opentelemetry-operator.webhookCertAnnotation" . }}#g' $(1)
-@sed -i "s/opentelemetry-operator-system/{{ .Release.Namespace }}/g" $(1)
+@sed -i 's/opentelemetry-operator-system/{{ template "opentelemetry-operator.namespace" . }}/g' $(1)
 @sed -i 's/opentelemetry-operator-webhook-service/{{ template "opentelemetry-operator.fullname" . }}-webhook/g' $(1)
 @sed -i '1s/^/{{- if .Values.crds.create }}\n/' $(1)
 @sed -i 's#\(.*\)path: /convert#&\n\1port: {{ .Values.admissionWebhooks.servicePort }}#' $(1)

README.md

@@ -49,29 +49,35 @@ in a Kubernetes cluster. More detailed documentation can be found in
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md).
 
-Approvers ([@open-telemetry/helm-approvers](https://github.com/orgs/open-telemetry/teams/helm-approvers)):
+### Maintainers
+
+- [Dmitrii Anoshin](https://github.com/dmitryax), Splunk
+- [Jacob Aronoff](https://github.com/jaronoff97), Lightstep
+- [Tyler Helmuth](https://github.com/TylerHelmuth), Honeycomb
+
+For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
+
+### Approvers
 
 - [Alex Birca](https://github.com/Allex1), Adobe
 - [Jared Tan](https://github.com/JaredTan95), DaoCloud
 - [Josh Voravong](https://github.com/jvoravong), Splunk
 - [Pierre Tessier](https://github.com/puckpuck), Honeycomb
 - [Povilas](https://github.com/povilasv), Coralogix
 
-Emeritus Approvers:
+For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
 
-- [Naseem K. Ullah](https://github.com/naseemkullah), Transit
+### Emeritus Maintainers
 
-Maintainers ([@open-telemetry/helm-maintainers](https://github.com/orgs/open-telemetry/teams/helm-maintainers)):
+- [Tigran Najaryan](https://github.com/tigrannajaryan)
 
-- [Dmitrii Anoshin](https://github.com/dmitryax), Splunk
-- [Jacob Aronoff](https://github.com/jaronoff97), Lightstep
-- [Tyler Helmuth](https://github.com/TylerHelmuth), Honeycomb
+For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
 
-Emeritus Maintainers:
+### Emeritus Approvers
 
-- [Tigran Najaryan](https://github.com/tigrannajaryan), Splunk
+- [Naseem K. Ullah](https://github.com/naseemkullah)
 
-Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md).
+For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
 
 ## License