Merge pull request #535 from openinfradev/byok

feature. add import api to stacks resource
openinfradev · Jul 18, 2024 · 2ca311d · 2ca311d
2 parents 1679c30 + eacd1fd
commit 2ca311d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/internal/repository/cluster.go b/internal/repository/cluster.go
@@ -116,7 +116,7 @@ func (r *ClusterRepository) GetByName(ctx context.Context, organizationId string
 func (r *ClusterRepository) Create(ctx context.Context, dto model.Cluster) (clusterId domain.ClusterId, err error) {
 	var cloudAccountId *uuid.UUID
 	cloudAccountId = dto.CloudAccountId
-	if dto.CloudService == domain.CloudService_BYOH || *dto.CloudAccountId == uuid.Nil {
+	if dto.CloudService == domain.CloudService_BYOH || dto.CloudService == domain.CloudService_BYOK || *dto.CloudAccountId == uuid.Nil {
 		cloudAccountId = nil
 	}
 	if dto.ID == "" {

diff --git a/internal/usecase/stack.go b/internal/usecase/stack.go
@@ -334,7 +334,7 @@ func (u *StackUsecase) Import(ctx context.Context, dto model.Stack) (stackId dom
 			"base_repo_branch=" + viper.GetString("revision"),
 			"policy_ids=" + strings.Join(dto.PolicyIds, ","),
 			"cluster_domains=" + strings.Join(domains, ","),
-			"kubeconfig=" + dto.Kubeconfig,
+			"kubeconfig_string=" + dto.Kubeconfig,
 		},
 	})
 	if err != nil {

diff --git a/pkg/domain/cluster.go b/pkg/domain/cluster.go
@@ -246,7 +246,7 @@ type ClusterSiteValuesResponse struct {
 	TksUserNodeType        string          `json:"tksUserNodeType,omitempty"`
 	ByoClusterEndpointHost string          `json:"byoClusterEndpointHost"`
 	ByoClusterEndpointPort int             `json:"byoClusterEndpointPort"`
-	Domains                []ClusterDomain `json:"domains,omitempty"`
+	Domains                []ClusterDomain `json:"domains"`
 }
 
 type GetClustersResponse struct {