Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 9 additions & 33 deletions apps/console/internal/domain/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"fmt"
"strings"

fn "github.com/kloudlite/api/pkg/functions"

"github.com/kloudlite/api/common/fields"
crdsv1 "github.com/kloudlite/operator/apis/crds/v1"

Expand Down Expand Up @@ -40,39 +38,17 @@ func (d *domain) findEnvironment(ctx ConsoleContext, name string) (*entities.Env
}

func (d *domain) getClusterAttachedToEnvironment(ctx K8sContext, name string) (*string, error) {
cacheKey := fmt.Sprintf("account_name_%s-cluster_name_%s", ctx.GetAccountName(), name)

clusterName, err := d.consoleCacheStore.Get(ctx, cacheKey)
if err != nil && !d.consoleCacheStore.ErrKeyNotFound(err) {
return nil, err
}

if len(clusterName) == 0 {
env, err := d.environmentRepo.FindOne(ctx, repos.Filter{
fields.AccountName: ctx.GetAccountName(),
fields.MetadataName: name,
})
if err != nil {
return nil, errors.NewE(err)
}
if env == nil {
return nil, errors.Newf("no cluster attached to this environment")
}

defer func() {
if err := d.consoleCacheStore.Set(ctx, cacheKey, []byte(env.ClusterName)); err != nil {
d.logger.Infof("failed to set env cluster map: %v", err)
}
}()

return &env.ClusterName, nil
env, err := d.environmentRepo.FindOne(ctx, repos.Filter{
fields.AccountName: ctx.GetAccountName(),
fields.MetadataName: name,
})
if err != nil {
return nil, errors.NewE(err)
}

if clusterName == nil {
return nil, nil
if env == nil {
return nil, errors.Newf("no cluster attached to this environment")
}

return fn.New(string(clusterName)), nil
return &env.ClusterName, nil
}

func (d *domain) envTargetNamespace(ctx ConsoleContext, envName string) (string, error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const (

// constant vars generated for struct BYOKCluster
const (
BYOKClusterClusterPublicEndpoint = "clusterPublicEndpoint"
BYOKClusterClusterSvcCIDR = "clusterSvcCIDR"
BYOKClusterClusterToken = "clusterToken"
BYOKClusterGlobalVPN = "globalVPN"
Expand Down