Skip to content

Commit 57024fc

Browse files
authored
Revert "Add reconciliation for Collector v1beta1 CRD (#2703)" (#2800)
This reverts commit 9710eed
1 parent d672bc9 commit 57024fc

File tree

64 files changed

+16248
-31313
lines changed

Some content is hidden

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

64 files changed

+16248
-31313
lines changed

.chloggen/v1beta1-webhook.yaml

-25
This file was deleted.

Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
3939
endif
4040
BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
4141

42-
# kubectl apply does not work on large CRDs.
43-
CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,maxDescLen=0"
42+
CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,maxDescLen=200"
4443

4544
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
4645
ifeq (,$(shell go env GOBIN))

apis/v1alpha1/collector_webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ func warningsGroupedByResource(reviews []*v1.SubjectAccessReview) []string {
451451
func SetupCollectorWebhook(mgr ctrl.Manager, cfg config.Config, reviewer *rbac.Reviewer) error {
452452
cvw := &CollectorWebhook{
453453
reviewer: reviewer,
454-
logger: mgr.GetLogger().WithValues("handler", "CollectorWebhook", "version", "v1alpha1"),
454+
logger: mgr.GetLogger().WithValues("handler", "CollectorWebhook"),
455455
scheme: mgr.GetScheme(),
456456
cfg: cfg,
457457
}

apis/v1alpha1/opentelemetrycollector_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ type OpenTelemetryCollectorStatus struct {
438438
Replicas int32 `json:"replicas,omitempty"`
439439
}
440440

441-
// +kubebuilder:deprecatedversion:warning="OpenTelemetryCollector v1alpha1 is deprecated. Migrate to v1beta1."
442441
// +kubebuilder:object:root=true
442+
// +kubebuilder:storageversion
443443
// +kubebuilder:resource:shortName=otelcol;otelcols
444444
// +kubebuilder:subresource:status
445445
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.scale.replicas,selectorpath=.status.scale.selector

apis/v1beta1/collector_webhook.go

-27
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,17 @@ import (
1919
"fmt"
2020
"strings"
2121

22-
"github.com/go-logr/logr"
2322
"k8s.io/apimachinery/pkg/runtime"
24-
ctrl "sigs.k8s.io/controller-runtime"
2523
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
26-
27-
"github.com/open-telemetry/opentelemetry-operator/internal/config"
28-
"github.com/open-telemetry/opentelemetry-operator/internal/rbac"
2924
)
3025

3126
var (
3227
_ admission.CustomValidator = &CollectorWebhook{}
3328
_ admission.CustomDefaulter = &CollectorWebhook{}
3429
)
3530

36-
// +kubebuilder:webhook:path=/mutate-opentelemetry-io-v1beta1-opentelemetrycollector,mutating=true,failurePolicy=fail,groups=opentelemetry.io,resources=opentelemetrycollectors,verbs=create;update,versions=v1beta1,name=mopentelemetrycollectorbeta.kb.io,sideEffects=none,admissionReviewVersions=v1
37-
// +kubebuilder:webhook:verbs=create;update,path=/validate-opentelemetry-io-v1beta1-opentelemetrycollector,mutating=false,failurePolicy=fail,groups=opentelemetry.io,resources=opentelemetrycollectors,versions=v1beta1,name=vopentelemetrycollectorcreateupdatebeta.kb.io,sideEffects=none,admissionReviewVersions=v1
38-
// +kubebuilder:webhook:verbs=delete,path=/validate-opentelemetry-io-v1beta1-opentelemetrycollector,mutating=false,failurePolicy=ignore,groups=opentelemetry.io,resources=opentelemetrycollectors,versions=v1beta1,name=vopentelemetrycollectordeletebeta.kb.io,sideEffects=none,admissionReviewVersions=v1
3931
// +kubebuilder:object:generate=false
40-
4132
type CollectorWebhook struct {
42-
logger logr.Logger
43-
cfg config.Config
44-
scheme *runtime.Scheme
45-
reviewer *rbac.Reviewer
4633
}
4734

4835
func (c CollectorWebhook) Default(_ context.Context, obj runtime.Object) error {
@@ -90,17 +77,3 @@ func (c CollectorWebhook) validate(r *OpenTelemetryCollector) (admission.Warning
9077
}
9178
return warnings, nil
9279
}
93-
94-
func SetupCollectorWebhook(mgr ctrl.Manager, cfg config.Config, reviewer *rbac.Reviewer) error {
95-
cvw := &CollectorWebhook{
96-
reviewer: reviewer,
97-
logger: mgr.GetLogger().WithValues("handler", "CollectorWebhook", "version", "v1beta1"),
98-
scheme: mgr.GetScheme(),
99-
cfg: cfg,
100-
}
101-
return ctrl.NewWebhookManagedBy(mgr).
102-
For(&OpenTelemetryCollector{}).
103-
WithValidator(cvw).
104-
WithDefaulter(cvw).
105-
Complete()
106-
}

apis/v1beta1/opentelemetrycollector_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// +kubebuilder:skip
16+
1517
package v1beta1
1618

1719
import (
@@ -26,7 +28,6 @@ func init() {
2628

2729
// +kubebuilder:object:root=true
2830
// +kubebuilder:resource:shortName=otelcol;otelcols
29-
// +kubebuilder:storageversion
3031
// +kubebuilder:subresource:status
3132
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.scale.replicas,selectorpath=.status.scale.selector
3233
// +kubebuilder:printcolumn:name="Mode",type="string",JSONPath=".spec.mode",description="Deployment Mode"

apis/v1beta1/targetallocator_types.go

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// +kubebuilder:skip
16+
1517
package v1beta1
1618

1719
import (

bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

+2-157
Original file line numberDiff line numberDiff line change
@@ -59,40 +59,6 @@ metadata:
5959
"spec": {
6060
"config": "receivers:\n otlp:\n protocols: \n grpc:\n http:\n\nexporters:\n debug:\n\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n exporters: [debug]\n"
6161
}
62-
},
63-
{
64-
"apiVersion": "opentelemetry.io/v1beta1",
65-
"kind": "OpenTelemetryCollector",
66-
"metadata": {
67-
"name": "otel"
68-
},
69-
"spec": {
70-
"config": {
71-
"exporters": {
72-
"debug": {}
73-
},
74-
"receivers": {
75-
"otlp": {
76-
"protocols": {
77-
"grpc": {},
78-
"http": {}
79-
}
80-
}
81-
},
82-
"service": {
83-
"pipelines": {
84-
"traces": {
85-
"exporters": [
86-
"debug"
87-
],
88-
"receivers": [
89-
"otlp"
90-
]
91-
}
92-
}
93-
}
94-
}
95-
}
9662
}
9763
]
9864
capabilities: Deep Insights
@@ -188,56 +154,6 @@ spec:
188154
displayName: Create ServiceMonitors for OpenTelemetry Collector
189155
path: targetAllocator.observability.metrics.enableMetrics
190156
version: v1alpha1
191-
- description: OpenTelemetryCollector is the Schema for the opentelemetrycollectors
192-
API.
193-
displayName: OpenTelemetry Collector
194-
kind: OpenTelemetryCollector
195-
name: opentelemetrycollectors.opentelemetry.io
196-
resources:
197-
- kind: ConfigMaps
198-
name: ""
199-
version: v1
200-
- kind: DaemonSets
201-
name: ""
202-
version: apps/v1
203-
- kind: Deployment
204-
name: ""
205-
version: apps/v1
206-
- kind: Pod
207-
name: ""
208-
version: v1
209-
- kind: Service
210-
name: ""
211-
version: v1
212-
- kind: StatefulSets
213-
name: ""
214-
version: apps/v1
215-
specDescriptors:
216-
- description: ObservabilitySpec defines how telemetry data gets handled.
217-
displayName: Observability
218-
path: observability
219-
- description: Metrics defines the metrics configuration for operands.
220-
displayName: Metrics Config
221-
path: observability.metrics
222-
- description: EnableMetrics specifies if ServiceMonitor or PodMonitor(for sidecar
223-
mode) should be created for the service managed by the OpenTelemetry Operator.
224-
The operator.observability.prometheus feature gate must be enabled to use
225-
this feature.
226-
displayName: Create ServiceMonitors for OpenTelemetry Collector
227-
path: observability.metrics.enableMetrics
228-
- description: ObservabilitySpec defines how telemetry data gets handled.
229-
displayName: Observability
230-
path: targetAllocator.observability
231-
- description: Metrics defines the metrics configuration for operands.
232-
displayName: Metrics Config
233-
path: targetAllocator.observability.metrics
234-
- description: EnableMetrics specifies if ServiceMonitor or PodMonitor(for sidecar
235-
mode) should be created for the service managed by the OpenTelemetry Operator.
236-
The operator.observability.prometheus feature gate must be enabled to use
237-
this feature.
238-
displayName: Create ServiceMonitors for OpenTelemetry Collector
239-
path: targetAllocator.observability.metrics.enableMetrics
240-
version: v1beta1
241157
description: |-
242158
OpenTelemetry is a collection of tools, APIs, and SDKs. You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior.
243159
@@ -572,9 +488,9 @@ spec:
572488
serviceAccountName: opentelemetry-operator-controller-manager
573489
strategy: deployment
574490
installModes:
575-
- supported: false
491+
- supported: true
576492
type: OwnNamespace
577-
- supported: false
493+
- supported: true
578494
type: SingleNamespace
579495
- supported: false
580496
type: MultiNamespace
@@ -599,18 +515,6 @@ spec:
599515
name: OpenTelemetry Community
600516
version: 0.96.0
601517
webhookdefinitions:
602-
- admissionReviewVersions:
603-
- v1alpha1
604-
- v1beta1
605-
containerPort: 443
606-
conversionCRDs:
607-
- opentelemetrycollectors.opentelemetry.io
608-
deploymentName: opentelemetry-operator-controller-manager
609-
generateName: copentelemetrycollectors.kb.io
610-
sideEffects: None
611-
targetPort: 9443
612-
type: ConversionWebhook
613-
webhookPath: /convert
614518
- admissionReviewVersions:
615519
- v1
616520
containerPort: 443
@@ -671,26 +575,6 @@ spec:
671575
targetPort: 9443
672576
type: MutatingAdmissionWebhook
673577
webhookPath: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector
674-
- admissionReviewVersions:
675-
- v1
676-
containerPort: 443
677-
deploymentName: opentelemetry-operator-controller-manager
678-
failurePolicy: Fail
679-
generateName: mopentelemetrycollectorbeta.kb.io
680-
rules:
681-
- apiGroups:
682-
- opentelemetry.io
683-
apiVersions:
684-
- v1beta1
685-
operations:
686-
- CREATE
687-
- UPDATE
688-
resources:
689-
- opentelemetrycollectors
690-
sideEffects: None
691-
targetPort: 9443
692-
type: MutatingAdmissionWebhook
693-
webhookPath: /mutate-opentelemetry-io-v1beta1-opentelemetrycollector
694578
- admissionReviewVersions:
695579
- v1
696580
containerPort: 443
@@ -808,26 +692,6 @@ spec:
808692
targetPort: 9443
809693
type: ValidatingAdmissionWebhook
810694
webhookPath: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
811-
- admissionReviewVersions:
812-
- v1
813-
containerPort: 443
814-
deploymentName: opentelemetry-operator-controller-manager
815-
failurePolicy: Fail
816-
generateName: vopentelemetrycollectorcreateupdatebeta.kb.io
817-
rules:
818-
- apiGroups:
819-
- opentelemetry.io
820-
apiVersions:
821-
- v1beta1
822-
operations:
823-
- CREATE
824-
- UPDATE
825-
resources:
826-
- opentelemetrycollectors
827-
sideEffects: None
828-
targetPort: 9443
829-
type: ValidatingAdmissionWebhook
830-
webhookPath: /validate-opentelemetry-io-v1beta1-opentelemetrycollector
831695
- admissionReviewVersions:
832696
- v1
833697
containerPort: 443
@@ -847,22 +711,3 @@ spec:
847711
targetPort: 9443
848712
type: ValidatingAdmissionWebhook
849713
webhookPath: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
850-
- admissionReviewVersions:
851-
- v1
852-
containerPort: 443
853-
deploymentName: opentelemetry-operator-controller-manager
854-
failurePolicy: Ignore
855-
generateName: vopentelemetrycollectordeletebeta.kb.io
856-
rules:
857-
- apiGroups:
858-
- opentelemetry.io
859-
apiVersions:
860-
- v1beta1
861-
operations:
862-
- DELETE
863-
resources:
864-
- opentelemetrycollectors
865-
sideEffects: None
866-
targetPort: 9443
867-
type: ValidatingAdmissionWebhook
868-
webhookPath: /validate-opentelemetry-io-v1beta1-opentelemetrycollector

0 commit comments

Comments
 (0)