Skip to content

Commit 19ffe48

Browse files
iblancasaiblancasa
authored
Merge branch 'main' into feature/3090
2 parents 93bc6c4 + dbf9c77 commit 19ffe48

19 files changed

+1133
-796
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
437437
CHAINSAW ?= $(LOCALBIN)/chainsaw
438438

439439
KUSTOMIZE_VERSION ?= v5.0.3
440-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
440+
CONTROLLER_TOOLS_VERSION ?= v0.16.1
441441
GOLANGCI_LINT_VERSION ?= v1.57.2
442442
KIND_VERSION ?= v0.20.0
443443
CHAINSAW_VERSION ?= v0.2.5

‎bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

+2-25
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-08-14T11:18:29Z"
102+
createdAt: "2024-08-21T12:36:08Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -378,6 +378,7 @@ spec:
378378
- opentelemetry.io
379379
resources:
380380
- instrumentations
381+
- opentelemetrycollectors
381382
verbs:
382383
- get
383384
- list
@@ -406,31 +407,7 @@ spec:
406407
- opentelemetry.io
407408
resources:
408409
- opampbridges/status
409-
verbs:
410-
- get
411-
- patch
412-
- update
413-
- apiGroups:
414-
- opentelemetry.io
415-
resources:
416-
- opentelemetrycollectors
417-
verbs:
418-
- get
419-
- list
420-
- patch
421-
- update
422-
- watch
423-
- apiGroups:
424-
- opentelemetry.io
425-
resources:
426410
- opentelemetrycollectors/finalizers
427-
verbs:
428-
- get
429-
- patch
430-
- update
431-
- apiGroups:
432-
- opentelemetry.io
433-
resources:
434411
- opentelemetrycollectors/status
435412
verbs:
436413
- get

‎bundle/community/manifests/opentelemetry.io_instrumentations.yaml

+15-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.16.1
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: opentelemetry-operator
@@ -189,6 +189,8 @@ spec:
189189
properties:
190190
name:
191191
type: string
192+
request:
193+
type: string
192194
required:
193195
- name
194196
type: object
@@ -299,6 +301,8 @@ spec:
299301
properties:
300302
name:
301303
type: string
304+
request:
305+
type: string
302306
required:
303307
- name
304308
type: object
@@ -478,6 +482,8 @@ spec:
478482
properties:
479483
name:
480484
type: string
485+
request:
486+
type: string
481487
required:
482488
- name
483489
type: object
@@ -598,6 +604,8 @@ spec:
598604
properties:
599605
name:
600606
type: string
607+
request:
608+
type: string
601609
required:
602610
- name
603611
type: object
@@ -774,6 +782,8 @@ spec:
774782
properties:
775783
name:
776784
type: string
785+
request:
786+
type: string
777787
required:
778788
- name
779789
type: object
@@ -882,6 +892,8 @@ spec:
882892
properties:
883893
name:
884894
type: string
895+
request:
896+
type: string
885897
required:
886898
- name
887899
type: object
@@ -1003,6 +1015,8 @@ spec:
10031015
properties:
10041016
name:
10051017
type: string
1018+
request:
1019+
type: string
10061020
required:
10071021
- name
10081022
type: object

‎bundle/community/manifests/opentelemetry.io_opampbridges.yaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.1
77
creationTimestamp: null
88
labels:
99
app.kubernetes.io/name: opentelemetry-operator
@@ -679,6 +679,8 @@ spec:
679679
type: integer
680680
type: array
681681
x-kubernetes-list-type: atomic
682+
supplementalGroupsPolicy:
683+
type: string
682684
sysctls:
683685
items:
684686
properties:
@@ -743,6 +745,8 @@ spec:
743745
properties:
744746
name:
745747
type: string
748+
request:
749+
type: string
746750
required:
747751
- name
748752
type: object
@@ -965,10 +969,12 @@ spec:
965969
diskURI:
966970
type: string
967971
fsType:
972+
default: ext4
968973
type: string
969974
kind:
970975
type: string
971976
readOnly:
977+
default: false
972978
type: boolean
973979
required:
974980
- diskName
@@ -1345,6 +1351,13 @@ spec:
13451351
required:
13461352
- path
13471353
type: object
1354+
image:
1355+
properties:
1356+
pullPolicy:
1357+
type: string
1358+
reference:
1359+
type: string
1360+
type: object
13481361
iscsi:
13491362
properties:
13501363
chapAuthDiscovery:
@@ -1358,6 +1371,7 @@ spec:
13581371
iqn:
13591372
type: string
13601373
iscsiInterface:
1374+
default: default
13611375
type: string
13621376
lun:
13631377
format: int32
@@ -1606,13 +1620,15 @@ spec:
16061620
image:
16071621
type: string
16081622
keyring:
1623+
default: /etc/ceph/keyring
16091624
type: string
16101625
monitors:
16111626
items:
16121627
type: string
16131628
type: array
16141629
x-kubernetes-list-type: atomic
16151630
pool:
1631+
default: rbd
16161632
type: string
16171633
readOnly:
16181634
type: boolean
@@ -1624,6 +1640,7 @@ spec:
16241640
type: object
16251641
x-kubernetes-map-type: atomic
16261642
user:
1643+
default: admin
16271644
type: string
16281645
required:
16291646
- image
@@ -1632,6 +1649,7 @@ spec:
16321649
scaleIO:
16331650
properties:
16341651
fsType:
1652+
default: xfs
16351653
type: string
16361654
gateway:
16371655
type: string
@@ -1649,6 +1667,7 @@ spec:
16491667
sslEnabled:
16501668
type: boolean
16511669
storageMode:
1670+
default: ThinProvisioned
16521671
type: string
16531672
storagePool:
16541673
type: string

0 commit comments

Comments
 (0)