Revert "Add reconciliation for Collector v1beta1 CRD (#2703)"

This reverts commit 9710eed

Makefile

@@ -39,8 +39,7 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
-# kubectl apply does not work on large CRDs.
-CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,maxDescLen=0"
+CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,maxDescLen=200"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

apis/v1alpha1/collector_webhook.go

@@ -451,7 +451,7 @@ func warningsGroupedByResource(reviews []*v1.SubjectAccessReview) []string {
 func SetupCollectorWebhook(mgr ctrl.Manager, cfg config.Config, reviewer *rbac.Reviewer) error {
 	cvw := &CollectorWebhook{
 		reviewer: reviewer,
-		logger:   mgr.GetLogger().WithValues("handler", "CollectorWebhook", "version", "v1alpha1"),
+		logger:   mgr.GetLogger().WithValues("handler", "CollectorWebhook"),
 		scheme:   mgr.GetScheme(),
 		cfg:      cfg,
 	}

apis/v1alpha1/opentelemetrycollector_types.go

@@ -438,8 +438,8 @@ type OpenTelemetryCollectorStatus struct {
 	Replicas int32 `json:"replicas,omitempty"`
 }
 
-// +kubebuilder:deprecatedversion:warning="OpenTelemetryCollector v1alpha1 is deprecated. Migrate to v1beta1."
 // +kubebuilder:object:root=true
+// +kubebuilder:storageversion
 // +kubebuilder:resource:shortName=otelcol;otelcols
 // +kubebuilder:subresource:status
 // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.scale.replicas,selectorpath=.status.scale.selector

apis/v1beta1/collector_webhook.go

@@ -19,30 +19,17 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
-
-	"github.com/open-telemetry/opentelemetry-operator/internal/config"
-	"github.com/open-telemetry/opentelemetry-operator/internal/rbac"
 )
 
 var (
 	_ admission.CustomValidator = &CollectorWebhook{}
 	_ admission.CustomDefaulter = &CollectorWebhook{}
 )
 
-// +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
-// +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
-// +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
 // +kubebuilder:object:generate=false
-
 type CollectorWebhook struct {
-	logger   logr.Logger
-	cfg      config.Config
-	scheme   *runtime.Scheme
-	reviewer *rbac.Reviewer
 }
 
 func (c CollectorWebhook) Default(_ context.Context, obj runtime.Object) error {
@@ -90,17 +77,3 @@ func (c CollectorWebhook) validate(r *OpenTelemetryCollector) (admission.Warning
 	}
 	return warnings, nil
 }
-
-func SetupCollectorWebhook(mgr ctrl.Manager, cfg config.Config, reviewer *rbac.Reviewer) error {
-	cvw := &CollectorWebhook{
-		reviewer: reviewer,
-		logger:   mgr.GetLogger().WithValues("handler", "CollectorWebhook", "version", "v1beta1"),
-		scheme:   mgr.GetScheme(),
-		cfg:      cfg,
-	}
-	return ctrl.NewWebhookManagedBy(mgr).
-		For(&OpenTelemetryCollector{}).
-		WithValidator(cvw).
-		WithDefaulter(cvw).
-		Complete()
-}

apis/v1beta1/opentelemetrycollector_types.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +kubebuilder:skip
+
 package v1beta1
 
 import (
@@ -26,7 +28,6 @@ func init() {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName=otelcol;otelcols
-// +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.scale.replicas,selectorpath=.status.scale.selector
 // +kubebuilder:printcolumn:name="Mode",type="string",JSONPath=".spec.mode",description="Deployment Mode"

apis/v1beta1/targetallocator_types.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +kubebuilder:skip
+
 package v1beta1
 
 import (

bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -59,40 +59,6 @@ metadata:
           "spec": {
             "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"
           }
-        },
-        {
-          "apiVersion": "opentelemetry.io/v1beta1",
-          "kind": "OpenTelemetryCollector",
-          "metadata": {
-            "name": "otel"
-          },
-          "spec": {
-            "config": {
-              "exporters": {
-                "debug": {}
-              },
-              "receivers": {
-                "otlp": {
-                  "protocols": {
-                    "grpc": {},
-                    "http": {}
-                  }
-                }
-              },
-              "service": {
-                "pipelines": {
-                  "traces": {
-                    "exporters": [
-                      "debug"
-                    ],
-                    "receivers": [
-                      "otlp"
-                    ]
-                  }
-                }
-              }
-            }
-          }
         }
       ]
     capabilities: Deep Insights
@@ -188,56 +154,6 @@ spec:
         displayName: Create ServiceMonitors for OpenTelemetry Collector
         path: targetAllocator.observability.metrics.enableMetrics
       version: v1alpha1
-    - description: OpenTelemetryCollector is the Schema for the opentelemetrycollectors
-        API.
-      displayName: OpenTelemetry Collector
-      kind: OpenTelemetryCollector
-      name: opentelemetrycollectors.opentelemetry.io
-      resources:
-      - kind: ConfigMaps
-        name: ""
-        version: v1
-      - kind: DaemonSets
-        name: ""
-        version: apps/v1
-      - kind: Deployment
-        name: ""
-        version: apps/v1
-      - kind: Pod
-        name: ""
-        version: v1
-      - kind: Service
-        name: ""
-        version: v1
-      - kind: StatefulSets
-        name: ""
-        version: apps/v1
-      specDescriptors:
-      - description: ObservabilitySpec defines how telemetry data gets handled.
-        displayName: Observability
-        path: observability
-      - description: Metrics defines the metrics configuration for operands.
-        displayName: Metrics Config
-        path: observability.metrics
-      - description: EnableMetrics specifies if ServiceMonitor or PodMonitor(for sidecar
-          mode) should be created for the service managed by the OpenTelemetry Operator.
-          The operator.observability.prometheus feature gate must be enabled to use
-          this feature.
-        displayName: Create ServiceMonitors for OpenTelemetry Collector
-        path: observability.metrics.enableMetrics
-      - description: ObservabilitySpec defines how telemetry data gets handled.
-        displayName: Observability
-        path: targetAllocator.observability
-      - description: Metrics defines the metrics configuration for operands.
-        displayName: Metrics Config
-        path: targetAllocator.observability.metrics
-      - description: EnableMetrics specifies if ServiceMonitor or PodMonitor(for sidecar
-          mode) should be created for the service managed by the OpenTelemetry Operator.
-          The operator.observability.prometheus feature gate must be enabled to use
-          this feature.
-        displayName: Create ServiceMonitors for OpenTelemetry Collector
-        path: targetAllocator.observability.metrics.enableMetrics
-      version: v1beta1
   description: |-
     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.
 
@@ -572,9 +488,9 @@ spec:
         serviceAccountName: opentelemetry-operator-controller-manager
     strategy: deployment
   installModes:
-  - supported: false
+  - supported: true
     type: OwnNamespace
-  - supported: false
+  - supported: true
     type: SingleNamespace
   - supported: false
     type: MultiNamespace
@@ -599,18 +515,6 @@ spec:
     name: OpenTelemetry Community
   version: 0.96.0
   webhookdefinitions:
-  - admissionReviewVersions:
-    - v1alpha1
-    - v1beta1
-    containerPort: 443
-    conversionCRDs:
-    - opentelemetrycollectors.opentelemetry.io
-    deploymentName: opentelemetry-operator-controller-manager
-    generateName: copentelemetrycollectors.kb.io
-    sideEffects: None
-    targetPort: 9443
-    type: ConversionWebhook
-    webhookPath: /convert
   - admissionReviewVersions:
     - v1
     containerPort: 443
@@ -671,26 +575,6 @@ spec:
     targetPort: 9443
     type: MutatingAdmissionWebhook
     webhookPath: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: opentelemetry-operator-controller-manager
-    failurePolicy: Fail
-    generateName: mopentelemetrycollectorbeta.kb.io
-    rules:
-    - apiGroups:
-      - opentelemetry.io
-      apiVersions:
-      - v1beta1
-      operations:
-      - CREATE
-      - UPDATE
-      resources:
-      - opentelemetrycollectors
-    sideEffects: None
-    targetPort: 9443
-    type: MutatingAdmissionWebhook
-    webhookPath: /mutate-opentelemetry-io-v1beta1-opentelemetrycollector
   - admissionReviewVersions:
     - v1
     containerPort: 443
@@ -808,26 +692,6 @@ spec:
     targetPort: 9443
     type: ValidatingAdmissionWebhook
     webhookPath: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: opentelemetry-operator-controller-manager
-    failurePolicy: Fail
-    generateName: vopentelemetrycollectorcreateupdatebeta.kb.io
-    rules:
-    - apiGroups:
-      - opentelemetry.io
-      apiVersions:
-      - v1beta1
-      operations:
-      - CREATE
-      - UPDATE
-      resources:
-      - opentelemetrycollectors
-    sideEffects: None
-    targetPort: 9443
-    type: ValidatingAdmissionWebhook
-    webhookPath: /validate-opentelemetry-io-v1beta1-opentelemetrycollector
   - admissionReviewVersions:
     - v1
     containerPort: 443
@@ -847,22 +711,3 @@ spec:
     targetPort: 9443
     type: ValidatingAdmissionWebhook
     webhookPath: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector
-  - admissionReviewVersions:
-    - v1
-    containerPort: 443
-    deploymentName: opentelemetry-operator-controller-manager
-    failurePolicy: Ignore
-    generateName: vopentelemetrycollectordeletebeta.kb.io
-    rules:
-    - apiGroups:
-      - opentelemetry.io
-      apiVersions:
-      - v1beta1
-      operations:
-      - DELETE
-      resources:
-      - opentelemetrycollectors
-    sideEffects: None
-    targetPort: 9443
-    type: ValidatingAdmissionWebhook
-    webhookPath: /validate-opentelemetry-io-v1beta1-opentelemetrycollector