Fix Cluster Manager Duplication

charts/kubernetes/Chart.yaml

@@ -4,8 +4,8 @@ description: A Helm chart for deploying Unikorn Kubernetes Service
 
 type: application
 
-version: v0.2.17
-appVersion: v0.2.17
+version: v0.2.18
+appVersion: v0.2.18
 
 icon: https://raw.githubusercontent.com/unikorn-cloud/assets/main/images/logos/dark-on-light/icon.png
 

pkg/apis/unikorn/v1alpha1/types.go

@@ -434,7 +434,7 @@ type KubernetesClusterSpec struct {
 	// Region to provision the cluster in.
 	RegionID string `json:"regionId"`
 	// ClusterManager that provides lifecycle management for the cluster.
-	ClusterManager string `json:"clusterManager"`
+	ClusterManagerID string `json:"clusterManagerId"`
 	// Version is the Kubernetes version to install.  For performance
 	// reasons this should match what is already pre-installed on the
 	// provided image.

pkg/openapi/server.spec.yaml

@@ -449,7 +449,7 @@ components:
         regionId:
           description: The region to provision the cluster in.
           type: string
-        clusterManager:
+        clusterManagerId:
           description: |-
             The name of the cluster manager to use, if one is not specified
             the system will create one for you.
@@ -616,7 +616,9 @@ components:
               id: c7568e2d-f9ab-453d-9a3a-51375f78426b
               name: default 
               organizationId: d4600d6e-e965-4b44-a808-84fb2fa36702
+              organizationName: acme-corp
               projectId: cae219d7-10e5-4601-8c2c-ee7e066b93ce
+              projectName: top-secret
               creationTime: 2023-07-31T10:45:45Z
               provisioningStatus: provisioned
     clusterManagersResponse:
@@ -630,7 +632,9 @@ components:
               id: c7568e2d-f9ab-453d-9a3a-51375f78426b
               name: default
               organizationId: d4600d6e-e965-4b44-a808-84fb2fa36702
+              organizationName: acme-corp
               projectId: cae219d7-10e5-4601-8c2c-ee7e066b93ce
+              projectName: top-secret
               creationTime: 2023-07-31T10:45:45Z
               provisioningStatus: provisioned
     kubernetesClusterKubeconfigResponse:
@@ -654,7 +658,7 @@ components:
             spec:
               regionId: b059b3e6-9ae5-42b7-94b4-f42fb7a6baee
               version: v1.27.2
-              clusterManager: b85525fc-40ca-482b-ac07-eca8b01b09c2
+              clusterManagerId: b85525fc-40ca-482b-ac07-eca8b01b09c2
               workloadPools:
               - name: default
                 machine:

pkg/provisioners/managers/cluster/provisioner.go

@@ -149,7 +149,7 @@ func (p *Provisioner) getClusterManager(ctx context.Context) (*unikornv1.Cluster
 
 	key := client.ObjectKey{
 		Namespace: projectNamespace.Name,
-		Name:      p.cluster.Spec.ClusterManager,
+		Name:      p.cluster.Spec.ClusterManagerID,
 	}
 
 	if err := coreclient.StaticClientFromContext(ctx).Get(ctx, key, &clusterManager); err != nil {

pkg/provisioners/managers/clustermanager/provisioner.go

@@ -172,7 +172,7 @@ func (p *Provisioner) Deprovision(ctx context.Context) error {
 	}
 
 	clusters.Items = slices.DeleteFunc(clusters.Items, func(cluster unikornv1.KubernetesCluster) bool {
-		return cluster.Spec.ClusterManager != p.clusterManager.Name
+		return cluster.Spec.ClusterManagerID != p.clusterManager.Name
 	})
 
 	if len(clusters.Items) != 0 {

pkg/server/handler/cluster/client.go

@@ -287,13 +287,13 @@ func (c *Client) Create(ctx context.Context, organizationID, projectID string, r
 	}
 
 	// Implicitly create the controller manager.
-	if request.Spec.ClusterManager == nil {
+	if request.Spec.ClusterManagerId == nil {
 		clusterManager, err := clustermanager.NewClient(c.client).CreateImplicit(ctx, organizationID, projectID)
 		if err != nil {
 			return err
 		}
 
-		request.Spec.ClusterManager = util.ToPointer(clusterManager.Name)
+		request.Spec.ClusterManagerId = util.ToPointer(clusterManager.Name)
 	}
 
 	cluster, err := c.generate(ctx, namespace, organizationID, projectID, request)

pkg/server/handler/cluster/conversion.go

@@ -99,10 +99,10 @@ func (c *Client) convert(in *unikornv1.KubernetesCluster) *openapi.KubernetesClu
 	out := &openapi.KubernetesClusterRead{
 		Metadata: conversion.ProjectScopedResourceReadMetadata(in, provisioningStatus),
 		Spec: openapi.KubernetesClusterSpec{
-			RegionId:       in.Spec.RegionID,
-			ClusterManager: &in.Spec.ClusterManager,
-			Version:        string(*in.Spec.Version),
-			WorkloadPools:  convertWorkloadPools(in),
+			RegionId:         in.Spec.RegionID,
+			ClusterManagerId: &in.Spec.ClusterManagerID,
+			Version:          string(*in.Spec.Version),
+			WorkloadPools:    convertWorkloadPools(in),
 		},
 	}
 
@@ -401,7 +401,7 @@ func (c *Client) generate(ctx context.Context, namespace *corev1.Namespace, orga
 		ObjectMeta: conversion.ProjectScopedObjectMetadata(&request.Metadata, namespace.Name, organizationID, projectID),
 		Spec: unikornv1.KubernetesClusterSpec{
 			RegionID:                     request.Spec.RegionId,
-			ClusterManager:               *request.Spec.ClusterManager,
+			ClusterManagerID:             *request.Spec.ClusterManagerId,
 			Version:                      util.ToPointer(unikornv1.SemanticVersion(request.Spec.Version)),
 			ApplicationBundle:            &applicationBundle.Name,
 			ApplicationBundleAutoUpgrade: &unikornv1.ApplicationBundleAutoUpgradeSpec{},

pkg/server/handler/clustermanager/client.go

@@ -23,6 +23,7 @@ import (
 	"slices"
 
 	unikornv1core "github.com/unikorn-cloud/core/pkg/apis/unikorn/v1alpha1"
+	"github.com/unikorn-cloud/core/pkg/constants"
 	coreopenapi "github.com/unikorn-cloud/core/pkg/openapi"
 	"github.com/unikorn-cloud/core/pkg/server/conversion"
 	"github.com/unikorn-cloud/core/pkg/server/errors"
@@ -37,6 +38,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -72,6 +74,26 @@ var (
 func (c *Client) CreateImplicit(ctx context.Context, organizationID, projectID string) (*unikornv1.ClusterManager, error) {
 	log := log.FromContext(ctx)
 
+	namespace, err := common.New(c.client).ProjectNamespace(ctx, organizationID, projectID)
+	if err != nil {
+		return nil, err
+	}
+
+	var existing unikornv1.ClusterManagerList
+
+	options := &client.ListOptions{
+		Namespace:     namespace.Name,
+		LabelSelector: labels.SelectorFromSet(labels.Set{constants.NameLabel: "default"}),
+	}
+
+	if err := c.client.List(ctx, &existing, options); err != nil {
+		return nil, err
+	}
+
+	if len(existing.Items) != 0 {
+		return &existing.Items[0], nil
+	}
+
 	log.Info("creating implicit control plane")
 
 	request := &openapi.ClusterManagerWrite{