Skip to content

Commit 85f2a66

Browse files
committed
fix: only check argocd-cm if trying to generate "in-cluster" secret
when calling "CreateCluster" in "admin cluster generate-spec" context, there is no argocd-cm avilable. Signed-off-by: Noam Gal <noam.gal@octopus.com>
1 parent ad2e445 commit 85f2a66

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

util/db/cluster.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,15 @@ func (db *db) ListClusters(_ context.Context) (*appv1.ClusterList, error) {
9494

9595
// CreateCluster creates a cluster
9696
func (db *db) CreateCluster(ctx context.Context, c *appv1.Cluster) (*appv1.Cluster, error) {
97-
settings, err := db.settingsMgr.GetSettings()
98-
if err != nil {
99-
return nil, err
100-
}
101-
if c.Server == appv1.KubernetesInternalAPIServerAddr && !settings.InClusterEnabled {
102-
return nil, status.Errorf(codes.InvalidArgument, "cannot register cluster: in-cluster has been disabled")
97+
if c.Server == appv1.KubernetesInternalAPIServerAddr {
98+
settings, err := db.settingsMgr.GetSettings()
99+
if err != nil {
100+
return nil, err
101+
}
102+
103+
if !settings.InClusterEnabled {
104+
return nil, status.Errorf(codes.InvalidArgument, "cannot register cluster: in-cluster has been disabled")
105+
}
103106
}
104107
secName, err := URIToSecretName("cluster", c.Server)
105108
if err != nil {

0 commit comments

Comments
 (0)