POC: Reconcile v1alpha2 crd

Makefile

@@ -39,7 +39,7 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
-CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,maxDescLen=200"
+CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,maxDescLen=0"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -157,6 +157,7 @@ enable-operator-featuregates: add-operator-arg
 .PHONY: deploy
 deploy: set-image-controller
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
+	$(KUSTOMIZE) build config/default > out.yaml
 	go run hack/check-operator-ready.go 300
 
 # Undeploy controller in the current Kubernetes context, configured in ~/.kube/config

apis/v1alpha1/collector_webhook.go

@@ -461,3 +461,5 @@ func SetupCollectorWebhook(mgr ctrl.Manager, cfg config.Config, reviewer *rbac.R
 		WithDefaulter(cvw).
 		Complete()
 }
+
+func (*OpenTelemetryCollector) Hub() {}

apis/v1alpha1/instrumentation_types.go

@@ -289,6 +289,7 @@ type Nginx struct {
 type InstrumentationStatus struct {
 }
 
+// +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName=otelinst;otelinsts
 // +kubebuilder:subresource:status

apis/v1alpha2/allocation_strategy.go → apis/v1beta1/allocation_strategy.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 type (
 	// TargetAllocatorAllocationStrategy represent a strategy Target Allocator uses to distribute targets to each collector

apis/v1alpha2/collector_webhook.go → apis/v1beta1/collector_webhook.go

@@ -12,11 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"context"
 	"fmt"
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+	v2 "sigs.k8s.io/controller-runtime/pkg/webhook/conversion/testdata/api/v2"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/runtime"
@@ -77,3 +80,29 @@ func (c CollectorWebhook) validate(r *OpenTelemetryCollector) (admission.Warning
 	}
 	return warnings, nil
 }
+
+var _ conversion.Convertible = &OpenTelemetryCollector{}
+
+func (c *OpenTelemetryCollector) ConvertTo(dst conversion.Hub) error {
+	fmt.Println("ConvertTo")
+	switch t := dst.(type) {
+	case *v2.ExternalJob:
+		colv1 := dst.(*v1alpha1.OpenTelemetryCollector)
+		c.ObjectMeta = colv1.ObjectMeta
+		return nil
+	default:
+		return fmt.Errorf("unsupported type %v", t)
+	}
+}
+
+func (c *OpenTelemetryCollector) ConvertFrom(src conversion.Hub) error {
+	fmt.Println("ConvertFrom")
+	switch t := src.(type) {
+	case *v1alpha1.OpenTelemetryCollector:
+		colv1 := src.(*v1alpha1.OpenTelemetryCollector)
+		c.ObjectMeta = colv1.ObjectMeta
+		return nil
+	default:
+		return fmt.Errorf("unsupported type %v", t)
+	}
+}

apis/v1alpha2/collector_webhook_test.go → apis/v1beta1/collector_webhook_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"testing"

apis/v1alpha2/common.go → apis/v1beta1/common.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	autoscalingv2 "k8s.io/api/autoscaling/v2"

apis/v1alpha2/config.go → apis/v1beta1/config.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"bytes"

apis/v1alpha2/config_test.go → apis/v1beta1/config_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"encoding/json"

apis/v1alpha2/groupversion_info.go → apis/v1beta1/groupversion_info.go

@@ -15,7 +15,7 @@
 // Package v1alpha2 contains API Schema definitions for the  v1alpha2 API group
 // +kubebuilder:object:generate=true
 // +groupName=opentelemetry.io
-package v1alpha2
+package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -24,7 +24,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "opentelemetry.io", Version: "v1alpha2"}
+	GroupVersion = schema.GroupVersion{Group: "opentelemetry.io", Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

apis/v1alpha2/ingress_type.go → apis/v1beta1/ingress_type.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 type (
 	// IngressType represents how a collector should be exposed (ingress vs route).

apis/v1alpha2/instrumentation_types.go → apis/v1beta1/instrumentation_types.go

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +kubebuilder:skip
-
-package v1alpha2
+package v1beta1
 
 import (
 	corev1 "k8s.io/api/core/v1"

apis/v1alpha2/mode.go → apis/v1beta1/mode.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 type (
 	// Mode represents how the collector should be deployed (deployment vs. daemonset)

apis/v1alpha2/opentelemetrycollector_types.go → apis/v1beta1/opentelemetrycollector_types.go

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +kubebuilder:skip
-
-package v1alpha2
+package v1beta1
 
 import (
 	appsv1 "k8s.io/api/apps/v1"

apis/v1alpha2/targetallocator_types.go → apis/v1beta1/targetallocator_types.go

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +kubebuilder:skip
-
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

apis/v1alpha2/upgrade_strategy.go → apis/v1beta1/upgrade_strategy.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 type (
 	// UpgradeStrategy represents how the operator will handle upgrades to the CR when a newer version of the operator is deployed

bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -65,13 +65,13 @@ metadata:
     categories: Logging & Tracing,Monitoring
     certified: "false"
     containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
-    createdAt: "2024-02-02T16:02:46Z"
+    createdAt: "2024-02-16T13:45:29Z"
     description: Provides the OpenTelemetry components, including the Collector
     operators.operatorframework.io/builder: operator-sdk-v1.29.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: github.com/open-telemetry/opentelemetry-operator
     support: OpenTelemetry Community
-  name: opentelemetry-operator.v0.93.0
+  name: opentelemetry-operator.v0.93.0-15-gb2ddcde
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -86,6 +86,9 @@ spec:
         name: ""
         version: v1
       version: v1alpha1
+    - kind: Instrumentation
+      name: instrumentations.opentelemetry.io
+      version: v1beta1
     - description: OpAMPBridge is the Schema for the opampbridges API.
       displayName: OpAMP Bridge
       kind: OpAMPBridge
@@ -154,6 +157,9 @@ spec:
         displayName: Create ServiceMonitors for OpenTelemetry Collector
         path: targetAllocator.observability.metrics.enableMetrics
       version: v1alpha1
+    - kind: OpenTelemetryCollector
+      name: opentelemetrycollectors.opentelemetry.io
+      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.
 
@@ -402,7 +408,7 @@ spec:
                 - --zap-log-level=info
                 - --zap-time-encoding=rfc3339nano
                 - --feature-gates=+operator.autoinstrumentation.go,+operator.autoinstrumentation.nginx
-                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.93.0
+                image: docker.io/pavolloffay/opentelemetry-operator:dev-b2ddcde-1708091123
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -485,9 +491,9 @@ spec:
         serviceAccountName: opentelemetry-operator-controller-manager
     strategy: deployment
   installModes:
-  - supported: true
+  - supported: false
     type: OwnNamespace
-  - supported: true
+  - supported: false
     type: SingleNamespace
   - supported: false
     type: MultiNamespace
@@ -510,8 +516,20 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: OpenTelemetry Community
-  version: 0.93.0
+  version: 0.93.0-15-gb2ddcde
   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