controller

Author: robertgraeff

api/v1alpha1/deployment_types.go

@@ -32,8 +32,9 @@ type DeploymentSpec struct {
 
 // DeploymentStatus defines the observed state of a provider.
 type DeploymentStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+	ObservedGeneration int64 `json:"observedGeneration"`
+
+	Phase string `json:"phase,omitempty"`
 }
 
 type ObjectReference struct {

docs/README.md

@@ -1,3 +1,6 @@
 <!-- Do not edit this file, as it is auto-generated!-->
 # Documentation Index
 
+## Resources
+
+

docs/resources/.docnames

@@ -0,0 +1,3 @@
+{
+    "header": "Resources"
+}

docs/resources/cluster-provider-gardener.yaml

@@ -0,0 +1,7 @@
+apiVersion: openmcp.cloud/v1alpha1
+kind: ClusterProvider
+metadata:
+    name: cluster-provider-gardener
+spec:
+  image: "ghcr.io/openmcp-project/images/cluster-provider-gardener:v0.0.1"
+  imagePullSecrets: []

docs/resources/service-provider-landscaper.yaml

@@ -0,0 +1,7 @@
+apiVersion: openmcp.cloud/v1alpha1
+kind: ServiceProvider
+metadata:
+  name: service-provider-landscaper
+spec:
+  image: "ghcr.io/openmcp-project/images/service-provider-landscaper:v0.0.4"
+  imagePullSecrets: []

internal/controller/provider_controller.go

@@ -15,42 +15,51 @@ import (
 )
 
 type ProviderReconciler struct {
-	Name string
 	schema.GroupVersionKind
-	client.Client
+	PlatformClient client.Client
+}
+
+func (r *ProviderReconciler) ControllerName() string {
+	return r.GroupVersionKind.String()
 }
 
 func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	log := logging.FromContextOrPanic(ctx).WithName(r.Name)
+	log := logging.FromContextOrPanic(ctx).WithName(r.ControllerName())
+	ctx = logging.NewContext(ctx, log)
+	log.Debug("Starting reconcile")
 
-	deployable := &unstructured.Unstructured{}
-	deployable.SetGroupVersionKind(r.GroupVersionKind)
+	provider := &unstructured.Unstructured{}
+	provider.SetGroupVersionKind(r.GroupVersionKind)
 
-	if err := r.Get(ctx, req.NamespacedName, deployable); err != nil {
-		return ctrl.Result{}, err
+	if err := r.PlatformClient.Get(ctx, req.NamespacedName, provider); err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to get provider resource: %w", err)
 	}
 
-	deployableOrig := deployable.DeepCopy()
-
-	log.Info("Reconciling deployable")
+	providerOrig := provider.DeepCopy()
 
-	deployableSpec := v1alpha1.DeploymentSpec{}
-	deploymentSpecRaw, found, err := unstructured.NestedFieldNoCopy(deployable.Object, "spec", "deploymentSpec")
+	deploymentSpec := v1alpha1.DeploymentSpec{}
+	deploymentSpecRaw, found, err := unstructured.NestedFieldNoCopy(provider.Object, "spec")
 	if !found {
-		return ctrl.Result{}, fmt.Errorf("deploymentSpec not found")
+		return ctrl.Result{}, fmt.Errorf("provider spec not found")
 	}
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{}, fmt.Errorf("failed to get provider spec: %w", err)
 	}
 
-	if err = runtime.DefaultUnstructuredConverter.FromUnstructured(deploymentSpecRaw.(map[string]interface{}), &deployableSpec); err != nil {
-		return ctrl.Result{}, err
+	if err = runtime.DefaultUnstructuredConverter.FromUnstructured(deploymentSpecRaw.(map[string]interface{}), &deploymentSpec); err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to convert provider spec: %w", err)
 	}
 
-	log.Info("DeployableSpec", "deployableSpec", deployableSpec)
+	log.Info("DeployableSpec", "deploymentSpec", deploymentSpec)
+
+	//if provider.GetDeletionTimestamp().IsZero() {
+	//	res, err = r.handleCreateUpdateOperation(ctx, provider)
+	//} else {
+	//	res, err = r.handleDeleteOperation(ctx, provider)
+	//}
 
 	deployableStatus := v1alpha1.DeploymentStatus{}
-	deploymentStatusRaw, found, _ := unstructured.NestedFieldNoCopy(deployable.Object, "status", "deploymentStatus")
+	deploymentStatusRaw, found, _ := unstructured.NestedFieldNoCopy(provider.Object, "status", "deploymentStatus")
 	if found {
 		if err = runtime.DefaultUnstructuredConverter.FromUnstructured(deploymentStatusRaw.(map[string]interface{}), &deployableStatus); err != nil {
 			return ctrl.Result{}, err
@@ -65,22 +74,30 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		return ctrl.Result{}, err
 	}
 
-	statusRaw, found, _ := unstructured.NestedFieldNoCopy(deployable.Object, "status")
+	statusRaw, found, _ := unstructured.NestedFieldNoCopy(provider.Object, "status")
 	if !found {
 		statusRaw = map[string]interface{}{}
-		if err = unstructured.SetNestedField(deployable.Object, statusRaw.(map[string]interface{}), "status"); err != nil {
+		if err = unstructured.SetNestedField(provider.Object, statusRaw.(map[string]interface{}), "status"); err != nil {
 			return ctrl.Result{}, err
 		}
 	}
 
-	if err = unstructured.SetNestedField(deployable.Object, deploymentSpecRaw, "status", "deploymentStatus"); err != nil {
+	if err = unstructured.SetNestedField(provider.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 {
+	if err = r.PlatformClient.Status().Patch(ctx, provider, client.MergeFrom(providerOrig)); err != nil {
 		return ctrl.Result{}, err
 	}
 
 	return ctrl.Result{}, nil
 }
+
+func (r *ProviderReconciler) handleCreateUpdateOperation(ctx context.Context, provider *unstructured.Unstructured) (ctrl.Result, error) {
+	return ctrl.Result{}, nil
+}
+
+func (r *ProviderReconciler) handleDeleteOperation(ctx context.Context, provider *unstructured.Unstructured) (ctrl.Result, error) {
+	return ctrl.Result{}, nil
+}

internal/controller/provider_controller_list.go

@@ -39,17 +39,16 @@ func (r *ProviderReconcilerList) SetupWithManager(mgr ctrl.Manager, providerGKVL
 
 	for i, gvk := range providerGKVList {
 		r.Reconcilers[i] = &ProviderReconciler{
-			Name:             gvk.String(),
 			GroupVersionKind: gvk,
-			Client:           mgr.GetClient(),
+			PlatformClient:   mgr.GetClient(),
 		}
 
 		obj := &unstructured.Unstructured{}
 		obj.SetGroupVersionKind(gvk)
 
 		err := ctrl.NewControllerManagedBy(mgr).
 			For(obj).
-			Named(r.Reconcilers[i].Name).
+			Named(r.Reconcilers[i].ControllerName()).
 			Complete(r.Reconcilers[i])
 		if err != nil {
 			allErrs = append(allErrs, field.InternalError(field.NewPath(gvk.String()), err))