controller

Author: robertgraeff

api/v1alpha1/deployable_types.go

@@ -0,0 +1,37 @@
+/*
+Copyright 2025.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// DeployableSpec defines the desired state of DeployableProvider.
+type DeployableSpec struct {
+	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+
+	// Image is the image of the provider to be deployed.
+	Image            string   `json:"image,omitempty"`
+	ImagePullSecrets []string `json:"imagePullSecrets,omitempty"`
+	ImagePullPolicy  string   `json:"imagePullPolicy,omitempty"`
+}
+
+// DeployableStatus defines the observed state of DeployableProvider.
+type DeployableStatus struct {
+	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+}

api/v1alpha1/deployableprovider_types.go

@@ -28,6 +28,8 @@ type DeployableProviderSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
+	DeploymentSpec DeployableSpec `json:"deploymentSpec,omitempty"`
+
 	// Foo is an example field of DeployableProvider. Edit deployableprovider_types.go to remove/update
 	Foo string `json:"foo,omitempty"`
 }
@@ -36,6 +38,8 @@ type DeployableProviderSpec struct {
 type DeployableProviderStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
+	DeploymentStatus DeployableStatus `json:"deploymentStatus,omitempty"`
 }
 
 // +kubebuilder:object:root=true

cmd/main.go

@@ -202,7 +202,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&controller.DeployableProviderReconciler{
+	if err = (&controller.DeployableReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {

internal/controller/deployableprovider_controller.go renamed to internal/controller/deployable_controller.go

@@ -19,18 +19,20 @@ package controller
 import (
 	"context"
 
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	openmcpcloudv1alpha1 "github.com/openmcp-project/openmcp-operator/api/v1alpha1"
 )
 
-// DeployableProviderReconciler reconciles a DeployableProvider object
-type DeployableProviderReconciler struct {
+// DeployableReconciler reconciles a DeployableProvider object
+type DeployableReconciler struct {
 	client.Client
-	Scheme *runtime.Scheme
+	Scheme      *runtime.Scheme
+	Reconcilers []*GVKReconciler
 }
 
 // +kubebuilder:rbac:groups=openmcp.cloud,resources=deployableproviders,verbs=get;list;watch;create;update;patch;delete
@@ -46,18 +48,39 @@ type DeployableProviderReconciler struct {
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
-func (r *DeployableProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *DeployableReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = log.FromContext(ctx)
-
-	// TODO(user): your logic here
-
 	return ctrl.Result{}, nil
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *DeployableProviderReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&openmcpcloudv1alpha1.DeployableProvider{}).
-		Named("deployableprovider").
-		Complete(r)
+func (r *DeployableReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	allErrs := field.ErrorList{}
+
+	gvkList := []schema.GroupVersionKind{
+		{Group: "openmcp.cloud", Version: "v1alpha1", Kind: "ClusterProvider"},
+		{Group: "openmcp.cloud", Version: "v1alpha1", Kind: "MCPServiceProvider"},
+	}
+
+	r.Reconcilers = make([]*GVKReconciler, 0, len(gvkList))
+
+	for i, gvk := range gvkList {
+		r.Reconcilers = append(r.Reconcilers, &GVKReconciler{
+			GroupVersionKind: gvk,
+			Client:           mgr.GetClient(),
+		})
+
+		obj := &unstructured.Unstructured{}
+		obj.SetGroupVersionKind(gvk)
+
+		err := ctrl.NewControllerManagedBy(mgr).
+			For(obj).
+			Named(gvk.String()).
+			Complete(r.Reconcilers[i])
+		if err != nil {
+			allErrs = append(allErrs, field.InternalError(field.NewPath(gvk.String()), err))
+		}
+	}
+
+	return allErrs.ToAggregate()
 }

internal/controller/deployableprovider_controller_test.go renamed to internal/controller/deployable_controller_test.go

@@ -68,7 +68,7 @@ var _ = Describe("DeployableProvider Controller", func() {
 		})
 		It("should successfully reconcile the resource", func() {
 			By("Reconciling the created resource")
-			controllerReconciler := &DeployableProviderReconciler{
+			controllerReconciler := &DeployableReconciler{
 				Client: k8sClient,
 				Scheme: k8sClient.Scheme(),
 			}

internal/controller/gvk_controller.go

@@ -0,0 +1,84 @@
+package controller
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	"github.com/openmcp-project/openmcp-operator/api/v1alpha1"
+)
+
+type GVKReconciler struct {
+	schema.GroupVersionKind
+	client.Client
+}
+
+func (r *GVKReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	deployable := &unstructured.Unstructured{}
+	deployable.SetGroupVersionKind(r.GroupVersionKind)
+
+	if err := r.Get(ctx, req.NamespacedName, deployable); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	deployableOrig := deployable.DeepCopy()
+
+	l := log.FromContext(ctx)
+	l.Info("Reconciling deployable")
+
+	deployableSpec := v1alpha1.DeployableSpec{}
+	deploymentSpecRaw, found, err := unstructured.NestedFieldNoCopy(deployable.Object, "spec", "deploymentSpec")
+	if !found {
+		return ctrl.Result{}, fmt.Errorf("deploymentSpec not found")
+	}
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	if err = runtime.DefaultUnstructuredConverter.FromUnstructured(deploymentSpecRaw.(map[string]interface{}), &deployableSpec); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	l.Info("DeployableSpec", "deployableSpec", deployableSpec)
+
+	deployableStatus := v1alpha1.DeployableStatus{}
+	deploymentStatusRaw, found, _ := unstructured.NestedFieldNoCopy(deployable.Object, "status", "deploymentStatus")
+	if found {
+		if err = runtime.DefaultUnstructuredConverter.FromUnstructured(deploymentStatusRaw.(map[string]interface{}), &deployableStatus); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
+	// set status
+	// deployableStatus.Status = true
+
+	deploymentSpecRaw, err = runtime.DefaultUnstructuredConverter.ToUnstructured(&deployableStatus)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	statusRaw, found, _ := unstructured.NestedFieldNoCopy(deployable.Object, "status")
+	if !found {
+		statusRaw = map[string]interface{}{}
+		if err = unstructured.SetNestedField(deployable.Object, statusRaw.(map[string]interface{}), "status"); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
+	if err = unstructured.SetNestedField(deployable.Object, deploymentSpecRaw, "status", "deploymentStatus"); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	// patch the status
+	if err = r.Status().Patch(ctx, deployable, client.MergeFrom(deployableOrig)); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	return ctrl.Result{}, nil
+}