Skip to content

Commit 2e81e36

Browse files
Bump operator from 0.80.2 to 0.86.2 in helm-charts/splunk-otel-collector/Chart.yaml (#1786)
* Update operator chart dependency version * fix tests for instrumentations * updates test data --------- Co-authored-by: jinja2 <[email protected]> Co-authored-by: Jina Jain <[email protected]>
1 parent d734898 commit 2e81e36

23 files changed

+3840
-49
lines changed

.chloggen/update-operator-crds.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
4+
component: opentelemetry-operator-crds
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Bump subchart opentelemetry-operator-crds to 0.0.2
7+
# One or more tracking issues related to the change
8+
issues: [1786]
9+
# (Optional) One or more lines of additional information to render under the primary note.
10+
# These lines will be padded with 2 spaces and then inserted directly into the document.
11+
# Use pipe (|) for multiline entries.
12+
subtext:

.chloggen/update-operator.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
4+
component: operator
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Bump operator to 0.86.2 in helm-charts/splunk-otel-collector/Chart.yaml
7+
# One or more tracking issues related to the change
8+
issues: [1786]
9+
# (Optional) One or more lines of additional information to render under the primary note.
10+
# These lines will be padded with 2 spaces and then inserted directly into the document.
11+
# Use pipe (|) for multiline entries.
12+
subtext:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/admission-webhooks/operator-webhook.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33
---
44
---
55
# Source: splunk-otel-collector/charts/operator/templates/admission-webhooks/operator-webhook.yaml
6+
---
7+
---
8+
# Source: splunk-otel-collector/charts/operator/templates/admission-webhooks/operator-webhook.yaml
69
apiVersion: admissionregistration.k8s.io/v1
710
kind: MutatingWebhookConfiguration
811
metadata:
912
labels:
10-
helm.sh/chart: operator-0.80.2
13+
helm.sh/chart: operator-0.86.2
1114
app.kubernetes.io/name: operator
12-
app.kubernetes.io/version: "0.117.0"
15+
app.kubernetes.io/version: "0.122.0"
1316
app.kubernetes.io/managed-by: Helm
17+
app.kubernetes.io/part-of: opentelemetry-operator
1418
app.kubernetes.io/instance: default
1519
app.kubernetes.io/component: webhook
1620
name: default-operator-mutation
@@ -92,10 +96,11 @@ apiVersion: admissionregistration.k8s.io/v1
9296
kind: ValidatingWebhookConfiguration
9397
metadata:
9498
labels:
95-
helm.sh/chart: operator-0.80.2
99+
helm.sh/chart: operator-0.86.2
96100
app.kubernetes.io/name: operator
97-
app.kubernetes.io/version: "0.117.0"
101+
app.kubernetes.io/version: "0.122.0"
98102
app.kubernetes.io/managed-by: Helm
103+
app.kubernetes.io/part-of: opentelemetry-operator
99104
app.kubernetes.io/instance: default
100105
app.kubernetes.io/component: webhook
101106
name: default-operator-validation
@@ -204,10 +209,11 @@ metadata:
204209
"helm.sh/hook": "pre-install,pre-upgrade"
205210
"helm.sh/hook-delete-policy": "before-hook-creation"
206211
labels:
207-
helm.sh/chart: operator-0.80.2
212+
helm.sh/chart: operator-0.86.2
208213
app.kubernetes.io/name: operator
209-
app.kubernetes.io/version: "0.117.0"
214+
app.kubernetes.io/version: "0.122.0"
210215
app.kubernetes.io/managed-by: Helm
216+
app.kubernetes.io/part-of: opentelemetry-operator
211217
app.kubernetes.io/instance: default
212218
app.kubernetes.io/component: webhook
213219
name: default-operator-controller-manager-service-cert

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/clusterrole.yaml

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: operator-0.80.2
7+
helm.sh/chart: operator-0.86.2
88
app.kubernetes.io/name: operator
9-
app.kubernetes.io/version: "0.117.0"
9+
app.kubernetes.io/version: "0.122.0"
1010
app.kubernetes.io/managed-by: Helm
11+
app.kubernetes.io/part-of: opentelemetry-operator
1112
app.kubernetes.io/instance: default
1213
app.kubernetes.io/component: controller-manager
1314
name: default-operator-manager
@@ -216,16 +217,51 @@ rules:
216217
- patch
217218
- update
218219
- watch
220+
- apiGroups:
221+
- opentelemetry.io
222+
resources:
223+
- targetallocators
224+
verbs:
225+
- create
226+
- delete
227+
- get
228+
- list
229+
- patch
230+
- update
231+
- watch
232+
- apiGroups:
233+
- opentelemetry.io
234+
resources:
235+
- targetallocators/status
236+
verbs:
237+
- get
238+
- patch
239+
- update
240+
- apiGroups:
241+
- cert-manager.io
242+
resources:
243+
- issuers
244+
- certificaterequests
245+
- certificates
246+
verbs:
247+
- create
248+
- get
249+
- list
250+
- watch
251+
- update
252+
- patch
253+
- delete
219254
---
220255
# Source: splunk-otel-collector/charts/operator/templates/clusterrole.yaml
221256
apiVersion: rbac.authorization.k8s.io/v1
222257
kind: ClusterRole
223258
metadata:
224259
labels:
225-
helm.sh/chart: operator-0.80.2
260+
helm.sh/chart: operator-0.86.2
226261
app.kubernetes.io/name: operator
227-
app.kubernetes.io/version: "0.117.0"
262+
app.kubernetes.io/version: "0.122.0"
228263
app.kubernetes.io/managed-by: Helm
264+
app.kubernetes.io/part-of: opentelemetry-operator
229265
app.kubernetes.io/instance: default
230266
app.kubernetes.io/component: controller-manager
231267
name: default-operator-metrics
@@ -240,10 +276,11 @@ apiVersion: rbac.authorization.k8s.io/v1
240276
kind: ClusterRole
241277
metadata:
242278
labels:
243-
helm.sh/chart: operator-0.80.2
279+
helm.sh/chart: operator-0.86.2
244280
app.kubernetes.io/name: operator
245-
app.kubernetes.io/version: "0.117.0"
281+
app.kubernetes.io/version: "0.122.0"
246282
app.kubernetes.io/managed-by: Helm
283+
app.kubernetes.io/part-of: opentelemetry-operator
247284
app.kubernetes.io/instance: default
248285
app.kubernetes.io/component: controller-manager
249286
name: default-operator-proxy

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/clusterrolebinding.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: operator-0.80.2
7+
helm.sh/chart: operator-0.86.2
88
app.kubernetes.io/name: operator
9-
app.kubernetes.io/version: "0.117.0"
9+
app.kubernetes.io/version: "0.122.0"
1010
app.kubernetes.io/managed-by: Helm
11+
app.kubernetes.io/part-of: opentelemetry-operator
1112
app.kubernetes.io/instance: default
1213
app.kubernetes.io/component: controller-manager
1314
name: default-operator-manager
@@ -25,10 +26,11 @@ apiVersion: rbac.authorization.k8s.io/v1
2526
kind: ClusterRoleBinding
2627
metadata:
2728
labels:
28-
helm.sh/chart: operator-0.80.2
29+
helm.sh/chart: operator-0.86.2
2930
app.kubernetes.io/name: operator
30-
app.kubernetes.io/version: "0.117.0"
31+
app.kubernetes.io/version: "0.122.0"
3132
app.kubernetes.io/managed-by: Helm
33+
app.kubernetes.io/part-of: opentelemetry-operator
3234
app.kubernetes.io/instance: default
3335
app.kubernetes.io/component: controller-manager
3436
name: default-operator-proxy

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/deployment.yaml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: operator-0.80.2
7+
helm.sh/chart: operator-0.86.2
88
app.kubernetes.io/name: operator
9-
app.kubernetes.io/version: "0.117.0"
9+
app.kubernetes.io/version: "0.122.0"
1010
app.kubernetes.io/managed-by: Helm
11+
app.kubernetes.io/part-of: opentelemetry-operator
1112
app.kubernetes.io/instance: default
1213
app.kubernetes.io/component: controller-manager
1314
name: default-operator
@@ -23,23 +24,33 @@ spec:
2324
annotations:
2425
kubectl.kubernetes.io/default-container: manager
2526
labels:
27+
helm.sh/chart: operator-0.86.2
2628
app.kubernetes.io/name: operator
29+
app.kubernetes.io/version: "0.122.0"
30+
app.kubernetes.io/managed-by: Helm
31+
app.kubernetes.io/part-of: opentelemetry-operator
32+
app.kubernetes.io/instance: default
2733
app.kubernetes.io/component: controller-manager
2834
spec:
35+
automountServiceAccountToken: true
2936
hostNetwork: false
3037
containers:
3138
- args:
3239
- --metrics-addr=0.0.0.0:8080
3340
- --enable-leader-election
3441
- --health-probe-addr=:8081
3542
- --webhook-port=9443
36-
- --collector-image=quay.io/signalfx/splunk-otel-collector:0.117.0
43+
- --collector-image=quay.io/signalfx/splunk-otel-collector:0.122.1
3744
command:
3845
- /manager
3946
env:
47+
- name: SERVICE_ACCOUNT_NAME
48+
valueFrom:
49+
fieldRef:
50+
fieldPath: spec.serviceAccountName
4051
- name: ENABLE_WEBHOOKS
4152
value: "true"
42-
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.117.0"
53+
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.122.0"
4354
name: manager
4455
ports:
4556
- containerPort: 8080
@@ -66,6 +77,14 @@ spec:
6677
- mountPath: /tmp/k8s-webhook-server/serving-certs
6778
name: cert
6879
readOnly: true
80+
securityContext:
81+
allowPrivilegeEscalation: false
82+
capabilities:
83+
drop:
84+
- ALL
85+
runAsNonRoot: true
86+
seccompProfile:
87+
type: RuntimeDefault
6988

7089
- args:
7190
- --secure-listen-address=0.0.0.0:8443
@@ -77,6 +96,16 @@ spec:
7796
- containerPort: 8443
7897
name: https
7998
protocol: TCP
99+
securityContext:
100+
allowPrivilegeEscalation: false
101+
capabilities:
102+
drop:
103+
- ALL
104+
runAsNonRoot: true
105+
seccompProfile:
106+
type: RuntimeDefault
107+
nodeSelector:
108+
kubernetes.io/os: linux
80109
serviceAccountName: operator
81110
terminationGracePeriodSeconds: 10
82111
volumes:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ spec:
6666
- name: OTEL_RESOURCE_ATTRIBUTES
6767
value: splunk.zc.method=splunk-otel-js:v2.15.0
6868
python:
69-
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.50b0
69+
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.51b0
7070
env:
7171
- name: OTEL_RESOURCE_ATTRIBUTES
72-
value: splunk.zc.method=autoinstrumentation-python:0.50b0
72+
value: splunk.zc.method=autoinstrumentation-python:0.51b0
7373
# python auto-instrumentation uses http/proto by default, so data must be sent to 4318 instead of 4317.
7474
# See: https://github.com/open-telemetry/opentelemetry-operator#opentelemetry-auto-instrumentation-injection
7575
- name: OTEL_EXPORTER_OTLP_ENDPOINT

0 commit comments

Comments
 (0)