K8s client app develop

.gitignore

@@ -4,3 +4,5 @@
 .env
 /cmd/external-app/devtron-ea
 devtron
+/cmd/k8s-client-app/ui/
+/cmd/k8s-client-app/devtron-k8s-client-*

Makefile

@@ -54,8 +54,8 @@ docker-build-push: docker-build-image
 
 #############################################################################
 
-build-all: build
-	make --directory ./cmd/external-app build
+build-all: build build-ea
+	make --directory ./cmd/k8s-client-app build
 
 build-ea:
 	make --directory ./cmd/external-app build

api/argoApplication/wire_argoApplication.go

@@ -35,3 +35,11 @@ var ArgoApplicationWireSet = wire.NewSet(
 	NewArgoApplicationRouterImpl,
 	wire.Bind(new(ArgoApplicationRouter), new(*ArgoApplicationRouterImpl)),
 )
+
+var ArgoApplicationWireSetForK8sApp = wire.NewSet(
+	read.NewNoopImpl,
+	wire.Bind(new(read.ArgoApplicationReadService), new(*read.ArgoApplicationReadServiceImpl)),
+
+	argoApplication.NewNoopImpl,
+	wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceImpl)),
+)

api/cluster/ClusterRestHandler.go

@@ -316,6 +316,9 @@ func (impl ClusterRestHandlerImpl) FindAll(w http.ResponseWriter, r *http.Reques
 		}
 	}
 	//RBAC enforcer Ends
+	if len(result) == 0 {
+		result = make([]*cluster.ClusterBean, 0)
+	}
 
 	common.WriteJsonResp(w, err, result, http.StatusOK)
 }

api/cluster/wire_cluster.go

@@ -99,3 +99,35 @@ var ClusterWireSetEa = wire.NewSet(
 	NewEnvironmentRouterImpl,
 	wire.Bind(new(EnvironmentRouter), new(*EnvironmentRouterImpl)),
 )
+
+var ClusterWireSetK8sClient = wire.NewSet(
+	cluster.NewNoopServiceImpl,
+	wire.Bind(new(cluster.EnvironmentService), new(*cluster.EnvironmentServiceImpl)),
+	repository.NewClusterRepositoryFileBased,
+	wire.Bind(new(repository.ClusterRepository), new(*repository.ClusterFileBasedRepository)),
+	cluster.NewClusterRbacNoopServiceImpl,
+	wire.Bind(new(cluster.ClusterRbacService), new(*cluster.ClusterRbacNoopServiceImpl)),
+	repository.NewClusterDescriptionFileBasedRepository,
+	wire.Bind(new(repository.ClusterDescriptionRepository), new(*repository.ClusterDescriptionFileBasedRepositoryImpl)),
+	cluster.NewClusterDescriptionServiceImpl,
+	wire.Bind(new(cluster.ClusterDescriptionService), new(*cluster.ClusterDescriptionServiceImpl)),
+
+	repository2.NewGenericNoteHistoryFileBasedRepositoryImpl,
+	wire.Bind(new(repository2.GenericNoteHistoryRepository), new(*repository2.GenericNoteHistoryFileBasedRepositoryImpl)),
+	repository2.NewGenericNoteFileBasedRepository,
+	wire.Bind(new(repository2.GenericNoteRepository), new(*repository2.GenericNoteFileBasedRepositoryImpl)),
+	genericNotes.NewGenericNoteHistoryServiceImpl,
+	wire.Bind(new(genericNotes.GenericNoteHistoryService), new(*genericNotes.GenericNoteHistoryServiceImpl)),
+	genericNotes.NewGenericNoteServiceImpl,
+	wire.Bind(new(genericNotes.GenericNoteService), new(*genericNotes.GenericNoteServiceImpl)),
+
+
+	cluster.NewClusterServiceImpl,
+	wire.Bind(new(cluster.ClusterService), new(*cluster.ClusterServiceImpl)),
+	NewClusterRestHandlerImpl,
+	wire.Bind(new(ClusterRestHandler), new(*ClusterRestHandlerImpl)),
+	NewClusterRouterImpl,
+	wire.Bind(new(ClusterRouter), new(*ClusterRouterImpl)),
+	cluster.NewKubeConfigFileSyncerImpl,
+	wire.Bind(new(cluster.KubeConfigFileSyncer), new(*cluster.KubeConfigFileSyncerImpl)),
+)

api/fluxApplication/wire_fluxApplication.go

@@ -15,3 +15,8 @@ var FluxApplicationWireSet = wire.NewSet(
 	NewFluxApplicationRouterImpl,
 	wire.Bind(new(FluxApplicationRouter), new(*FluxApplicationRouterImpl)),
 )
+
+var FluxApplicationWireSetForK8sApp = wire.NewSet(
+	fluxApplication.NewNoopImpl,
+	wire.Bind(new(fluxApplication.FluxApplicationService), new(*fluxApplication.FluxApplicationServiceImpl)),
+)

api/helm-app/service/HelmAppService.go

@@ -110,6 +110,10 @@ type HelmAppServiceImpl struct {
 	helmReleaseConfig                    *HelmReleaseConfig
 }
 
+func NewNoopServiceImpl() *HelmAppServiceImpl {
+	return nil
+}
+
 func NewHelmAppServiceImpl(Logger *zap.SugaredLogger, clusterService cluster.ClusterService,
 	helmAppClient gRPC.HelmAppClient, pump connector.Pump, enforcerUtil rbac.EnforcerUtilHelm,
 	serverDataStore *serverDataStore.ServerDataStore, serverEnvConfig *serverEnvConfig.ServerEnvConfig,

api/k8s/application/k8sApplicationRestHandler.go

@@ -973,7 +973,7 @@ func (handler *K8sApplicationRestHandlerImpl) getRbacCallbackForResource(token s
 }
 
 func (handler *K8sApplicationRestHandlerImpl) verifyRbacForResource(token string, clusterName string, resourceIdentifier util3.ResourceIdentifier, casbinAction string) bool {
-	resourceName, objectName := handler.enforcerUtil.GetRBACNameForClusterEntity(clusterName, resourceIdentifier)
+	resourceName, objectName := rbac.GetRBACNameForClusterEntity(clusterName, resourceIdentifier)
 	return handler.enforcer.Enforce(token, strings.ToLower(resourceName), casbinAction, objectName)
 }
 

api/k8s/capacity/k8sCapacityRestHandler.go

@@ -140,7 +140,7 @@ func (handler *K8sCapacityRestHandlerImpl) GetClusterListWithDetail(w http.Respo
 			authenticatedClusters = append(authenticatedClusters, cluster)
 		}
 	}
-	if len(authenticatedClusters) == 0 {
+	if len(authenticatedClusters) == 0 && len(clusters) != 0 {
 		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 		return
 	}
@@ -150,6 +150,9 @@ func (handler *K8sCapacityRestHandlerImpl) GetClusterListWithDetail(w http.Respo
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
+	if len(clusterDetailList) == 0 {
+		clusterDetailList = make([]*bean.ClusterCapacityDetail, 0)
+	}
 	common.WriteJsonResp(w, nil, clusterDetailList, http.StatusOK)
 }
 

api/k8s/wire_k8sApp.go

@@ -54,3 +54,29 @@ var K8sApplicationWireSet = wire.NewSet(
 	informer.NewK8sInformerFactoryImpl,
 	wire.Bind(new(informer.K8sInformerFactory), new(*informer.K8sInformerFactoryImpl)),
 )
+
+var K8sApplicationWireSetForK8sApp = wire.NewSet(
+	application2.NewK8sApplicationServiceImpl,
+	wire.Bind(new(application2.K8sApplicationService), new(*application2.K8sApplicationServiceImpl)),
+	k8s.NewK8sCommonServiceImpl,
+	wire.Bind(new(k8s.K8sCommonService), new(*k8s.K8sCommonServiceImpl)),
+	application.NewK8sApplicationRouterImpl,
+	wire.Bind(new(application.K8sApplicationRouter), new(*application.K8sApplicationRouterImpl)),
+	application.NewK8sApplicationRestHandlerImpl,
+	wire.Bind(new(application.K8sApplicationRestHandler), new(*application.K8sApplicationRestHandlerImpl)),
+	clusterRepository.NewEphemeralContainerFileBasedRepository,
+	wire.Bind(new(clusterRepository.EphemeralContainersRepository), new(*clusterRepository.EphemeralContainerFileBasedRepositoryImpl)),
+	cluster.NewEphemeralContainerServiceImpl,
+	wire.Bind(new(cluster.EphemeralContainerService), new(*cluster.EphemeralContainerServiceImpl)),
+	terminal.NewTerminalSessionHandlerImpl,
+	wire.Bind(new(terminal.TerminalSessionHandler), new(*terminal.TerminalSessionHandlerImpl)),
+	capacity.NewK8sCapacityRouterImpl,
+	wire.Bind(new(capacity.K8sCapacityRouter), new(*capacity.K8sCapacityRouterImpl)),
+	capacity.NewK8sCapacityRestHandlerImpl,
+	wire.Bind(new(capacity.K8sCapacityRestHandler), new(*capacity.K8sCapacityRestHandlerImpl)),
+	capacity2.NewK8sCapacityServiceImpl,
+	wire.Bind(new(capacity2.K8sCapacityService), new(*capacity2.K8sCapacityServiceImpl)),
+	informer.NewGlobalMapClusterNamespace,
+	informer.NewK8sInformerFactoryImpl,
+	wire.Bind(new(informer.K8sInformerFactory), new(*informer.K8sInformerFactoryImpl)),
+)

api/terminal/wire_terminal.go

@@ -17,19 +17,29 @@
 package terminal
 
 import (
-	"github.com/devtron-labs/devtron/internal/sql/repository"
+	"github.com/devtron-labs/devtron/internal/sql/repository/terminal"
 	"github.com/devtron-labs/devtron/pkg/clusterTerminalAccess"
 	"github.com/google/wire"
 )
 
-var TerminalWireSet = wire.NewSet(
+var terminalWireBaseSet = wire.NewSet(
 	NewUserTerminalAccessRouterImpl,
 	wire.Bind(new(UserTerminalAccessRouter), new(*UserTerminalAccessRouterImpl)),
 	NewUserTerminalAccessRestHandlerImpl,
 	wire.Bind(new(UserTerminalAccessRestHandler), new(*UserTerminalAccessRestHandlerImpl)),
 	clusterTerminalAccess.GetTerminalAccessConfig,
 	clusterTerminalAccess.NewUserTerminalAccessServiceImpl,
 	wire.Bind(new(clusterTerminalAccess.UserTerminalAccessService), new(*clusterTerminalAccess.UserTerminalAccessServiceImpl)),
-	repository.NewTerminalAccessRepositoryImpl,
-	wire.Bind(new(repository.TerminalAccessRepository), new(*repository.TerminalAccessRepositoryImpl)),
+)
+
+var TerminalWireSet = wire.NewSet(
+	terminalWireBaseSet,
+	terminal.NewTerminalAccessRepositoryImpl,
+	wire.Bind(new(terminal.TerminalAccessRepository), new(*terminal.TerminalAccessRepositoryImpl)),
+)
+
+var TerminalWireSetK8sClient = wire.NewSet(
+	terminalWireBaseSet,
+	terminal.NewTerminalAccessFileBasedRepository,
+	wire.Bind(new(terminal.TerminalAccessRepository), new(*terminal.TerminalAccessFileBasedRepository)),
 )