Feat/kloudlite edge clusters

.tools/nvim/__http__/accounts/accounts.graphql.yml

@@ -44,14 +44,15 @@ query: |
     accounts_createAccount(account: $account) {
       id
       isActive
+      kloudliteGatewayRegion
     }
   }
 variables:
   account:
-    contactEmail: "{{.email}}"
-    displayName: "Example Account Name"
+    displayName: "test account - nxt"
     metadata:
       name: "{{.accountName}}"
+    kloudliteGatewayRegion: "k3d/mt1"
 
 ---
 

.tools/nvim/__http__/console/apps.graphql.yml

@@ -1,6 +1,7 @@
 ---
 global:
   name: sample-app
+  envName: "test-env5"
 ---
 
 label: List Apps
@@ -84,7 +85,7 @@ variables:
   app:
     displayName: "sample app"
     metadata:
-      name: "{{.name}}"
+      name: "{{.name}}1"
     spec:
       services:
         - port: 80
@@ -117,9 +118,7 @@ variables:
       name: '{{.name}}'
     spec:
       services:
-        - type: tcp
-          port: 80
-          targetPort: 80
+        - port: 80
       containers:
         - name: main
           image: kong/httpbin
@@ -146,3 +145,13 @@ variables:
   envName: "{{.envName}}"
   appName: "{{.name}}"
 ---
+
+label: Resync App
+query: |+
+  query Query($envName: String!, $name: String!) {
+    core_resyncApp(envName: $envName, name: $name)
+  }
+variables:
+  envName: "{{.envName}}"
+  name: "{{.name}}"
+---

.tools/nvim/__http__/console/environments.graphql.yml

@@ -1,7 +1,5 @@
 ---
-global:
-  envTargetNamespace: "nxtcoder17"
-  envName: "test-env"
+global: {}
 ---
 
 label: List Environments
@@ -41,6 +39,10 @@ query: |+ #graphql
             action
           }
           recordVersion
+          onlineStatus {
+            lastOnlineAt
+            willBeOfflineAt
+          }
         }
       }
       pageInfo {
@@ -62,7 +64,7 @@ query: |+ #graphql
       apiVersion
       kind
       spec {
-        targetNamespace
+       targetNamespace
       }
       syncStatus {
         state
@@ -76,11 +78,9 @@ query: |+ #graphql
 variables:
   env:
     displayName: Display Name of a sample environment
-    clusterName: "{{.gcpClusterName}}"
+    clusterName: "__kloudlite_enabled_cluster"
     metadata:
-      name: "{{.envName}}"
-    # spec:
-    # projectName: "{{.projectName}}"
+      name: "{{.envName}}8"
 ---
 
 label: resync environment
@@ -121,12 +121,11 @@ variables:
 
 label: "delete environment"
 query: |+
-  mutation Core_deleteEnvironment($projectName: String!, $envName: String!) {
-    core_deleteEnvironment(projectName: $projectName, envName: $envName)
+  mutation Core_deleteEnvironment($envName: String!) {
+    core_deleteEnvironment(envName: $envName)
   }
 variables:
-  projectName: "{{.projectName}}"
-  envName: "{{.clonedEnvName}}"
+  envName: "{{.envName}}4"
 ---
 
 ---

apps/accounts/internal/domain/accounts.go

@@ -13,7 +13,6 @@ import (
 	iamT "github.com/kloudlite/api/apps/iam/types"
 	"github.com/kloudlite/api/common"
 	"github.com/kloudlite/api/constants"
-	"github.com/kloudlite/api/grpc-interfaces/container_registry"
 	"github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/iam"
 	fn "github.com/kloudlite/api/pkg/functions"
 	"github.com/kloudlite/api/pkg/repos"
@@ -108,33 +107,33 @@ func (d *domain) ensureKloudliteRegistryCredentials(ctx UserContext, account *en
 		return nil
 	}
 
-	out, err := d.containerRegistryClient.CreateReadOnlyCredential(ctx, &container_registry.CreateReadOnlyCredentialIn{
-		AccountName:      account.Name,
-		UserId:           string(ctx.UserId),
-		CredentialName:   credentialsName,
-		RegistryUsername: fmt.Sprintf("account_%s", account.Name),
-	})
-	if err != nil {
-		return err
-	}
-
-	if err := d.k8sClient.Create(ctx, &corev1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      credentialsName,
-			Namespace: account.TargetNamespace,
-		},
-		Immutable: new(bool),
-		Data: map[string][]byte{
-			corev1.DockerConfigJsonKey: []byte(out.DockerConfigJson),
-		},
-		Type: corev1.SecretTypeDockerConfigJson,
-	}); err != nil {
-		return err
-	}
+	// out, err := d.containerRegistryClient.CreateReadOnlyCredential(ctx, &container_registry.CreateReadOnlyCredentialIn{
+	// 	AccountName:      account.Name,
+	// 	UserId:           string(ctx.UserId),
+	// 	CredentialName:   credentialsName,
+	// 	RegistryUsername: fmt.Sprintf("account_%s", account.Name),
+	// })
+	// if err != nil {
+	// 	return err
+	// }
+
+	// if err := d.k8sClient.Create(ctx, &corev1.Secret{
+	// 	TypeMeta: metav1.TypeMeta{
+	// 		Kind:       "Secret",
+	// 		APIVersion: "v1",
+	// 	},
+	// 	ObjectMeta: metav1.ObjectMeta{
+	// 		Name:      credentialsName,
+	// 		Namespace: account.TargetNamespace,
+	// 	},
+	// 	Immutable: new(bool),
+	// 	Data: map[string][]byte{
+	// 		corev1.DockerConfigJsonKey: []byte(out.DockerConfigJson),
+	// 	},
+	// 	Type: corev1.SecretTypeDockerConfigJson,
+	// }); err != nil {
+	// 	return err
+	// }
 
 	return nil
 }
@@ -167,13 +166,13 @@ func (d *domain) CreateAccount(ctx UserContext, account entities.Account) (*enti
 		return nil, errors.NewE(err)
 	}
 
-	if err := d.ensureNamespaceForAccount(ctx, account.Name, account.TargetNamespace); err != nil {
-		return nil, errors.NewE(err)
-	}
+	// if err := d.ensureNamespaceForAccount(ctx, account.Name, account.TargetNamespace); err != nil {
+	// 	return nil, errors.NewE(err)
+	// }
 
-	if err := d.ensureKloudliteRegistryCredentials(ctx, &account); err != nil {
-		return nil, errors.NewE(err)
-	}
+	// if err := d.ensureKloudliteRegistryCredentials(ctx, &account); err != nil {
+	// 	return nil, errors.NewE(err)
+	// }
 
 	return acc, nil
 }

apps/accounts/internal/domain/domain.go

@@ -4,7 +4,6 @@ import (
 	"github.com/kloudlite/api/apps/accounts/internal/entities"
 	"github.com/kloudlite/api/apps/accounts/internal/env"
 	iamT "github.com/kloudlite/api/apps/iam/types"
-	"github.com/kloudlite/api/grpc-interfaces/container_registry"
 	"github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/auth"
 	"github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/comms"
 	"github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/console"
@@ -73,11 +72,11 @@ type Domain interface {
 }
 
 type domain struct {
-	authClient              auth.AuthClient
-	iamClient               iam.IAMClient
-	consoleClient           console.ConsoleClient
-	containerRegistryClient container_registry.ContainerRegistryClient
-	commsClient             comms.CommsClient
+	authClient    auth.AuthClient
+	iamClient     iam.IAMClient
+	consoleClient console.ConsoleClient
+	// containerRegistryClient container_registry.ContainerRegistryClient
+	commsClient comms.CommsClient
 
 	accountRepo    repos.DbRepo[*entities.Account]
 	invitationRepo repos.DbRepo[*entities.Invitation]
@@ -93,7 +92,7 @@ type domain struct {
 func NewDomain(
 	iamCli iam.IAMClient,
 	consoleClient console.ConsoleClient,
-	containerRegistryClient container_registry.ContainerRegistryClient,
+	// containerRegistryClient container_registry.ContainerRegistryClient,
 	authClient auth.AuthClient,
 	commsClient comms.CommsClient,
 
@@ -108,11 +107,11 @@ func NewDomain(
 	logger logging.Logger,
 ) Domain {
 	return &domain{
-		authClient:              authClient,
-		iamClient:               iamCli,
-		consoleClient:           consoleClient,
-		commsClient:             commsClient,
-		containerRegistryClient: containerRegistryClient,
+		authClient:    authClient,
+		iamClient:     iamCli,
+		consoleClient: consoleClient,
+		commsClient:   commsClient,
+		// containerRegistryClient: containerRegistryClient,
 
 		k8sClient: k8sClient,
 

apps/accounts/internal/env/env.go

@@ -19,11 +19,11 @@ type Env struct {
 
 	CookieDomain string `env:"COOKIE_DOMAIN" required:"true"`
 
-	IamGrpcAddr               string `env:"IAM_GRPC_ADDR" required:"true"`
-	CommsGrpcAddr             string `env:"COMMS_GRPC_ADDR" required:"true"`
-	ContainerRegistryGrpcAddr string `env:"CONTAINER_REGISTRY_GRPC_ADDR" required:"true"`
-	ConsoleGrpcAddr           string `env:"CONSOLE_GRPC_ADDR" required:"true"`
-	AuthGrpcAddr              string `env:"AUTH_GRPC_ADDR" required:"true"`
+	IamGrpcAddr   string `env:"IAM_GRPC_ADDR" required:"true"`
+	CommsGrpcAddr string `env:"COMMS_GRPC_ADDR" required:"true"`
+	// ContainerRegistryGrpcAddr string `env:"CONTAINER_REGISTRY_GRPC_ADDR" required:"true"`
+	ConsoleGrpcAddr string `env:"CONSOLE_GRPC_ADDR" required:"true"`
+	AuthGrpcAddr    string `env:"AUTH_GRPC_ADDR" required:"true"`
 
 	SessionKVBucket string `env:"SESSION_KV_BUCKET" required:"true"`
 	NatsURL         string `env:"NATS_URL" required:"true"`

apps/accounts/internal/framework/framework.go

@@ -68,17 +68,18 @@ var Module = fx.Module("framework",
 		return grpc.NewGrpcClient(ev.CommsGrpcAddr)
 	}),
 
-	fx.Provide(func(ev *env.Env) (app.ContainerRegistryClient, error) {
-		return grpc.NewGrpcClient(ev.ContainerRegistryGrpcAddr)
-	}),
+	// fx.Provide(func(ev *env.Env) (app.ContainerRegistryClient, error) {
+	// 	return grpc.NewGrpcClient(ev.ContainerRegistryGrpcAddr)
+	// }),
 
 	fx.Provide(func(ev *env.Env) (app.ConsoleClient, error) {
 		return grpc.NewGrpcClient(ev.ConsoleGrpcAddr)
 	}),
 
 	app.Module,
 
-	fx.Invoke(func(c1 app.AuthClient, c2 app.IAMClient, c3 app.CommsClient, c4 app.ContainerRegistryClient, c5 app.ConsoleClient, lf fx.Lifecycle) {
+	// fx.Invoke(func(c1 app.AuthClient, c2 app.IAMClient, c3 app.CommsClient, c4 app.ContainerRegistryClient, c5 app.ConsoleClient, lf fx.Lifecycle) {
+	fx.Invoke(func(c1 app.AuthClient, c2 app.IAMClient, c3 app.CommsClient, c5 app.ConsoleClient, lf fx.Lifecycle) {
 		lf.Append(fx.Hook{
 			OnStop: func(context.Context) error {
 				if err := c1.Close(); err != nil {
@@ -90,9 +91,9 @@ var Module = fx.Module("framework",
 				if err := c3.Close(); err != nil {
 					return errors.NewE(err)
 				}
-				if err := c4.Close(); err != nil {
-					return errors.NewE(err)
-				}
+				// if err := c4.Close(); err != nil {
+				// 	return errors.NewE(err)
+				// }
 				if err := c5.Close(); err != nil {
 					return errors.NewE(err)
 				}

apps/auth/internal/app/app.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"context"
+
 	"github.com/99designs/gqlgen/graphql"
 	"github.com/gofiber/fiber/v2"
 	"github.com/kloudlite/api/apps/auth/internal/app/graph"

apps/auth/internal/domain/domain.go

@@ -2,6 +2,7 @@ package domain
 
 import (
 	"context"
+
 	"github.com/kloudlite/api/apps/auth/internal/entities"
 	"github.com/kloudlite/api/common"
 	"github.com/kloudlite/api/pkg/repos"
@@ -38,7 +39,7 @@ type Domain interface {
 
 	CreateInviteCode(ctx context.Context, name string, inviteCode string) (*entities.InviteCode, error)
 	DeleteInviteCode(ctx context.Context, invCodeId string) error
-	//UpdateInviteCode(ctx context.Context, invCode entities.InviteCode) (*entities.InviteCode, error)
+	// UpdateInviteCode(ctx context.Context, invCode entities.InviteCode) (*entities.InviteCode, error)
 
 	VerifyInviteCode(ctx context.Context, userId repos.ID, invitationCode string) (bool, error)
 }