From 5765f0de5c002a812f5e3167acebb2685a92ec55 Mon Sep 17 00:00:00 2001 From: Simon Murray Date: Thu, 11 Apr 2024 13:20:02 +0100 Subject: [PATCH] Fix Cluster Controller Default (#43) .. for good this time!!! --- charts/unikorn/Chart.yaml | 4 ++-- pkg/server/handler/cluster/client.go | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/charts/unikorn/Chart.yaml b/charts/unikorn/Chart.yaml index 03302a30..2f620f77 100644 --- a/charts/unikorn/Chart.yaml +++ b/charts/unikorn/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for deploying Unikorn type: application -version: v0.2.3 -appVersion: v0.2.3 +version: v0.2.4 +appVersion: v0.2.4 icon: https://raw.githubusercontent.com/unikorn-cloud/unikorn/main/icons/default.png diff --git a/pkg/server/handler/cluster/client.go b/pkg/server/handler/cluster/client.go index 28ed4d81..983d9bcd 100644 --- a/pkg/server/handler/cluster/client.go +++ b/pkg/server/handler/cluster/client.go @@ -27,6 +27,7 @@ import ( coreclient "github.com/unikorn-cloud/core/pkg/client" "github.com/unikorn-cloud/core/pkg/server/errors" + "github.com/unikorn-cloud/core/pkg/util" unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/clusteropenstack" "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/vcluster" @@ -213,13 +214,11 @@ func (c *Client) Create(ctx context.Context, organizationName, projectName strin } // Implicitly create the controller manager. - clusterManagerName := "default" - - if options.ClusterManager != nil { - clusterManagerName = *options.ClusterManager + if options.ClusterManager == nil { + options.ClusterManager = util.ToPointer("default") } - if err := clustermanager.NewClient(c.client).CreateImplicit(ctx, organizationName, projectName, clusterManagerName); err != nil { + if err := clustermanager.NewClient(c.client).CreateImplicit(ctx, organizationName, projectName, *options.ClusterManager); err != nil { return err }