Skip to content

Commit ea96757

Browse files
authored
Merge branch 'main' into example_ta_collector_deployments
2 parents 2561a47 + 97ea912 commit ea96757

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+350
-82
lines changed

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
persist-credentials: false
2525

26-
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
26+
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
2727
with:
2828
results_file: results.sarif
2929
results_format: sarif

charts/opentelemetry-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-operator
3-
version: 0.90.0
3+
version: 0.90.3
44
description: OpenTelemetry Operator Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-operator/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ _See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation
4343
4444
```console
4545
$ helm install opentelemetry-operator open-telemetry/opentelemetry-operator \
46-
--set "manager.collectorImage.repository=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s
46+
--set "manager.collectorImage.repository=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s"
4747
```
4848

4949
If you created a custom namespace, like in the TLS Certificate Requirement section above, you will need to specify the namespace with the `--namespace` helm option:
5050

5151
```console
5252
$ helm install opentelemetry-operator open-telemetry/opentelemetry-operator \
5353
--namespace opentelemetry-operator-system \
54-
--set "manager.collectorImage.repository=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s
54+
--set "manager.collectorImage.repository=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s"
5555
```
5656

5757
If you wish for helm to create an automatically generated self-signed certificate, make sure to set the appropriate values when installing the chart:
5858

5959
```console
6060
$ helm install opentelemetry-operator open-telemetry/opentelemetry-operator \
61-
--set "manager.collectorImage.repository=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s \
61+
--set "manager.collectorImage.repository=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" \
6262
--set admissionWebhooks.certManager.enabled=false \
6363
--set admissionWebhooks.autoGenerateCert.enabled=true
6464
```

charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.90.0
9+
helm.sh/chart: opentelemetry-operator-0.90.3
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.126.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -91,7 +91,7 @@ metadata:
9191
annotations:
9292
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9393
labels:
94-
helm.sh/chart: opentelemetry-operator-0.90.0
94+
helm.sh/chart: opentelemetry-operator-0.90.3
9595
app.kubernetes.io/name: opentelemetry-operator
9696
app.kubernetes.io/version: "0.126.0"
9797
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
3030
kind: Issuer
3131
metadata:
3232
labels:
33-
helm.sh/chart: opentelemetry-operator-0.90.0
33+
helm.sh/chart: opentelemetry-operator-0.90.3
3434
app.kubernetes.io/name: opentelemetry-operator
3535
app.kubernetes.io/version: "0.126.0"
3636
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -36,14 +36,65 @@ rules:
3636
- events
3737
verbs:
3838
- create
39+
- get
40+
- list
3941
- patch
42+
- watch
4043
- apiGroups:
4144
- ""
4245
resources:
4346
- namespaces
4447
verbs:
4548
- list
4649
- watch
50+
- apiGroups:
51+
- ""
52+
resources:
53+
- namespaces/status
54+
verbs:
55+
- get
56+
- list
57+
- watch
58+
- apiGroups:
59+
- ""
60+
resources:
61+
- nodes/spec
62+
verbs:
63+
- get
64+
- list
65+
- watch
66+
- apiGroups:
67+
- ""
68+
resources:
69+
- pods/status
70+
verbs:
71+
- get
72+
- list
73+
- watch
74+
- apiGroups:
75+
- ""
76+
resources:
77+
- replicationcontrollers
78+
verbs:
79+
- get
80+
- list
81+
- watch
82+
- apiGroups:
83+
- ""
84+
resources:
85+
- replicationcontrollers/status
86+
verbs:
87+
- get
88+
- list
89+
- watch
90+
- apiGroups:
91+
- ""
92+
resources:
93+
- resourcequotas
94+
verbs:
95+
- get
96+
- list
97+
- watch
4798
- apiGroups:
4899
- apps
49100
resources:
@@ -67,6 +118,22 @@ rules:
67118
- get
68119
- list
69120
- watch
121+
- apiGroups:
122+
- extensions
123+
resources:
124+
- daemonsets
125+
verbs:
126+
- get
127+
- list
128+
- watch
129+
- apiGroups:
130+
- extensions
131+
resources:
132+
- deployments
133+
verbs:
134+
- get
135+
- list
136+
- watch
70137
- apiGroups:
71138
- autoscaling
72139
resources:
@@ -87,6 +154,14 @@ rules:
87154
- get
88155
- list
89156
- watch
157+
- apiGroups:
158+
- batch
159+
resources:
160+
- cronjobs
161+
verbs:
162+
- get
163+
- list
164+
- watch
90165
- apiGroups:
91166
- ""
92167
resources:
@@ -117,6 +192,13 @@ rules:
117192
- get
118193
- list
119194
- update
195+
- apiGroups:
196+
- events.k8s.io
197+
resources:
198+
- events
199+
verbs:
200+
- list
201+
- watch
120202
- apiGroups:
121203
- monitoring.coreos.com
122204
resources:
@@ -269,7 +351,7 @@ apiVersion: rbac.authorization.k8s.io/v1
269351
kind: ClusterRole
270352
metadata:
271353
labels:
272-
helm.sh/chart: opentelemetry-operator-0.90.0
354+
helm.sh/chart: opentelemetry-operator-0.90.3
273355
app.kubernetes.io/name: opentelemetry-operator
274356
app.kubernetes.io/version: "0.126.0"
275357
app.kubernetes.io/managed-by: Helm
@@ -288,7 +370,7 @@ apiVersion: rbac.authorization.k8s.io/v1
288370
kind: ClusterRole
289371
metadata:
290372
labels:
291-
helm.sh/chart: opentelemetry-operator-0.90.0
373+
helm.sh/chart: opentelemetry-operator-0.90.3
292374
app.kubernetes.io/name: opentelemetry-operator
293375
app.kubernetes.io/version: "0.126.0"
294376
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
2626
kind: ClusterRoleBinding
2727
metadata:
2828
labels:
29-
helm.sh/chart: opentelemetry-operator-0.90.0
29+
helm.sh/chart: opentelemetry-operator-0.90.3
3030
app.kubernetes.io/name: opentelemetry-operator
3131
app.kubernetes.io/version: "0.126.0"
3232
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ spec:
2525
annotations:
2626
kubectl.kubernetes.io/default-container: manager
2727
labels:
28-
helm.sh/chart: opentelemetry-operator-0.90.0
28+
helm.sh/chart: opentelemetry-operator-0.90.3
2929
app.kubernetes.io/name: opentelemetry-operator
3030
app.kubernetes.io/version: "0.126.0"
3131
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: RoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Service
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
3232
kind: Service
3333
metadata:
3434
labels:
35-
helm.sh/chart: opentelemetry-operator-0.90.0
35+
helm.sh/chart: opentelemetry-operator-0.90.3
3636
app.kubernetes.io/name: opentelemetry-operator
3737
app.kubernetes.io/version: "0.126.0"
3838
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
name: opentelemetry-operator
88
namespace: default
99
labels:
10-
helm.sh/chart: opentelemetry-operator-0.90.0
10+
helm.sh/chart: opentelemetry-operator-0.90.3
1111
app.kubernetes.io/name: opentelemetry-operator
1212
app.kubernetes.io/version: "0.126.0"
1313
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-cert-manager"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.90.0
9+
helm.sh/chart: opentelemetry-operator-0.90.3
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.126.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-metrics"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.90.0
9+
helm.sh/chart: opentelemetry-operator-0.90.3
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.126.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -59,7 +59,7 @@ metadata:
5959
name: "example-opentelemetry-operator-webhook"
6060
namespace: default
6161
labels:
62-
helm.sh/chart: opentelemetry-operator-0.90.0
62+
helm.sh/chart: opentelemetry-operator-0.90.3
6363
app.kubernetes.io/name: opentelemetry-operator
6464
app.kubernetes.io/version: "0.126.0"
6565
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.90.0
9+
helm.sh/chart: opentelemetry-operator-0.90.3
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.126.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -91,7 +91,7 @@ metadata:
9191
annotations:
9292
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9393
labels:
94-
helm.sh/chart: opentelemetry-operator-0.90.0
94+
helm.sh/chart: opentelemetry-operator-0.90.3
9595
app.kubernetes.io/name: opentelemetry-operator
9696
app.kubernetes.io/version: "0.126.0"
9797
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.90.0
7+
helm.sh/chart: opentelemetry-operator-0.90.3
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.126.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
3030
kind: Issuer
3131
metadata:
3232
labels:
33-
helm.sh/chart: opentelemetry-operator-0.90.0
33+
helm.sh/chart: opentelemetry-operator-0.90.3
3434
app.kubernetes.io/name: opentelemetry-operator
3535
app.kubernetes.io/version: "0.126.0"
3636
app.kubernetes.io/managed-by: Helm

0 commit comments

Comments
 (0)