Merge branch 'main' into 939-scope-webhook-rules

open-telemetry · Nov 13, 2023 · 3076742 · 3076742
2 parents fe17f04 + 5e9d6b7
commit 3076742
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -32,7 +32,7 @@ jobs:
           helm repo add jaeger https://jaegertracing.github.io/helm-charts
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@v1.6.0
         with:
           charts_dir: charts
         env:

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
@@ -131,6 +131,7 @@ rules:
       - monitoring.coreos.com
     resources:
       - servicemonitors
+      - podmonitors
     verbs:
       - create
       - delete

diff --git a/charts/opentelemetry-operator/templates/clusterrole.yaml b/charts/opentelemetry-operator/templates/clusterrole.yaml
@@ -126,6 +126,7 @@ rules:
       - monitoring.coreos.com
     resources:
       - servicemonitors
+      - podmonitors
     verbs:
       - create
       - delete