Skip to content

Commit c1e6ecd

Browse files
committed
Generate only TargetAllocator CR from Collector CR
This is hidden behind a feature flag. Nothing changes by default.
1 parent afc0cae commit c1e6ecd

17 files changed

+2275
-112
lines changed

.github/workflows/e2e.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
- group: e2e-native-sidecar
5050
setup: "add-operator-arg OPERATOR_ARG='--feature-gates=operator.sidecarcontainers.native' prepare-e2e"
5151
kube-version: "1.29"
52+
- group: e2e-targetallocator
53+
setup: "enable-targetallocator-cr prepare-e2e"
5254
steps:
5355
- name: Check out code into the Go module directory
5456
uses: actions/checkout@v4

Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ add-rbac-permissions-to-operator: manifests kustomize
213213
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/rbac.yaml
214214
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/replicaset.yaml
215215

216+
.PHONY: enable-targetallocator-cr
217+
enable-targetallocator-cr:
218+
@$(MAKE) add-operator-arg OPERATOR_ARG='--feature-gates=operator.collector.targetallocatorcr'
219+
cd config/crd && $(KUSTOMIZE) edit add resource bases/opentelemetry.io_targetallocators.yaml
220+
216221
# Deploy controller in the current Kubernetes context, configured in ~/.kube/config
217222
.PHONY: deploy
218223
deploy: set-image-controller

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

+3-1
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-10-16T10:10:50Z"
102+
createdAt: "2024-10-28T12:09:04Z"
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
@@ -389,6 +389,7 @@ spec:
389389
- opentelemetry.io
390390
resources:
391391
- opampbridges
392+
- targetallocators
392393
verbs:
393394
- create
394395
- delete
@@ -409,6 +410,7 @@ spec:
409410
- opampbridges/status
410411
- opentelemetrycollectors/finalizers
411412
- opentelemetrycollectors/status
413+
- targetallocators/status
412414
verbs:
413415
- get
414416
- patch

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

+3-1
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-10-16T10:10:50Z"
102+
createdAt: "2024-10-28T12:09:05Z"
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
@@ -389,6 +389,7 @@ spec:
389389
- opentelemetry.io
390390
resources:
391391
- opampbridges
392+
- targetallocators
392393
verbs:
393394
- create
394395
- delete
@@ -409,6 +410,7 @@ spec:
409410
- opampbridges/status
410411
- opentelemetrycollectors/finalizers
411412
- opentelemetrycollectors/status
413+
- targetallocators/status
412414
verbs:
413415
- get
414416
- patch

config/rbac/role.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ rules:
135135
- opentelemetry.io
136136
resources:
137137
- opampbridges
138+
- targetallocators
138139
verbs:
139140
- create
140141
- delete
@@ -155,6 +156,7 @@ rules:
155156
- opampbridges/status
156157
- opentelemetrycollectors/finalizers
157158
- opentelemetrycollectors/status
159+
- targetallocators/status
158160
verbs:
159161
- get
160162
- patch

0 commit comments

Comments
 (0)