Refactor: refactor cd interface (#127)

* refactor: cd simplify Signed-off-by: closetool <[email protected]> * chore: add paths to build image action Signed-off-by: closetool <[email protected]> * fix: autoPromote was covered after pausing Signed-off-by: closetool <[email protected]> * fix: some cemment Signed-off-by: closetool <[email protected]> * feat: support cancel release Signed-off-by: closetool <[email protected]> * fix: add description for action Signed-off-by: closetool <[email protected]> * fix: err returned from rollout actions Signed-off-by: closetool <[email protected]> --------- Signed-off-by: closetool <[email protected]>
horizoncd · Apr 20, 2023 · d6b5c09 · d6b5c09
1 parent f07df8f
commit d6b5c09
Show file tree

Hide file tree

Showing 46 changed files with 1,106 additions and 1,140 deletions.
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "**.go"
+      - "!**_test.go"
+      - "build/**"
     tags:
       - v*
 

diff --git a/core/cmd/cmd.go b/core/cmd/cmd.go
@@ -91,6 +91,7 @@ import (
 	"github.com/horizoncd/horizon/core/middleware/auth"
 	"github.com/horizoncd/horizon/core/middleware/requestid"
 	gitlablib "github.com/horizoncd/horizon/lib/gitlab"
+	"github.com/horizoncd/horizon/pkg/cd"
 	"github.com/horizoncd/horizon/pkg/environment/service"
 	"github.com/horizoncd/horizon/pkg/grafana"
 	"github.com/horizoncd/horizon/pkg/jobs"
@@ -124,7 +125,6 @@ import (
 	"github.com/horizoncd/horizon/pkg/application/gitrepo"
 	applicationservice "github.com/horizoncd/horizon/pkg/application/service"
 	userauth "github.com/horizoncd/horizon/pkg/authentication/user"
-	"github.com/horizoncd/horizon/pkg/cluster/cd"
 	"github.com/horizoncd/horizon/pkg/cluster/code"
 	clustergitrepo "github.com/horizoncd/horizon/pkg/cluster/gitrepo"
 	clusterservice "github.com/horizoncd/horizon/pkg/cluster/service"
@@ -438,6 +438,7 @@ func Init(ctx context.Context, flags *Flags, coreConfig *config.Config) {
 		ApplicationGitRepo:   applicationGitRepo,
 		TemplateSchemaGetter: templateSchemaGetter,
 		Cd:                   cd.NewCD(clusterGitRepo, coreConfig.ArgoCDMapper, flags.GitOpsRepoDefaultBranch),
+		K8sUtil:              cd.NewK8sUtil(),
 		OutputGetter:         outputGetter,
 		TektonFty:            tektonFty,
 		ClusterGitRepo:       clusterGitRepo,

diff --git a/core/common/cluster.go b/core/common/cluster.go
@@ -27,6 +27,11 @@ const (
 	ClusterQueryIsFavorite = "isFavorite"
 	// ClusterQueryWithFavorite is used to query cluster with favorite field inside.
 	ClusterQueryWithFavorite = "withFavorite"
+	ClusterQueryAction       = "action"
+
+	ClusterQueryByGVK = "gvk"
+
+	ClusterQueryResourceName = "resourceName"
 )
 
 const (

diff --git a/core/controller/cluster/controller.go b/core/controller/cluster/controller.go
@@ -9,7 +9,7 @@ import (
 	appgitrepo "github.com/horizoncd/horizon/pkg/application/gitrepo"
 	appmanager "github.com/horizoncd/horizon/pkg/application/manager"
 	applicationservice "github.com/horizoncd/horizon/pkg/application/service"
-	"github.com/horizoncd/horizon/pkg/cluster/cd"
+	"github.com/horizoncd/horizon/pkg/cd"
 	"github.com/horizoncd/horizon/pkg/cluster/code"
 	"github.com/horizoncd/horizon/pkg/cluster/gitrepo"
 	clustermanager "github.com/horizoncd/horizon/pkg/cluster/manager"
@@ -39,6 +39,7 @@ import (
 	tokenservice "github.com/horizoncd/horizon/pkg/token/service"
 	usermanager "github.com/horizoncd/horizon/pkg/user/manager"
 	usersvc "github.com/horizoncd/horizon/pkg/user/service"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 type Controller interface {
@@ -68,10 +69,8 @@ type Controller interface {
 	InternalDeploy(ctx context.Context, clusterID uint,
 		r *InternalDeployRequest) (_ *InternalDeployResponse, err error)
 
-	Promote(ctx context.Context, clusterID uint) error
-	Pause(ctx context.Context, clusterID uint) error
-	Resume(ctx context.Context, clusterID uint) error
-	Next(ctx context.Context, clusterID uint) error
+	ExecuteAction(ctx context.Context, clusterID uint, action string,
+		gvk schema.GroupVersionResource) error
 
 	// Deprecated: GetClusterStatus
 	GetClusterStatus(ctx context.Context, clusterID uint) (_ *GetClusterStatusResponse, err error)
@@ -82,7 +81,7 @@ type Controller interface {
 	Exec(ctx context.Context, clusterID uint, r *ExecRequest) (_ ExecResponse, err error)
 
 	GetDiff(ctx context.Context, clusterID uint, refType, ref string) (*GetDiffResponse, error)
-	GetContainerLog(ctx context.Context, clusterID uint, podName, containerName string, tailLines int) (
+	GetContainerLog(ctx context.Context, clusterID uint, podName, containerName string, tailLines int64) (
 		<-chan string, error)
 
 	DeleteClusterPods(ctx context.Context, clusterID uint, podName []string) (BatchResponse, error)
@@ -116,6 +115,7 @@ type controller struct {
 	applicationGitRepo    appgitrepo.ApplicationGitRepo
 	commitGetter          code.GitGetter
 	cd                    cd.CD
+	k8sutil               cd.K8sUtil
 	applicationMgr        appmanager.Manager
 	autoFreeSvc           *service.AutoFreeSVC
 	applicationSvc        applicationservice.Service
@@ -155,6 +155,7 @@ func NewController(config *config.Config, param *param.Param) Controller {
 		applicationGitRepo:    param.ApplicationGitRepo,
 		commitGetter:          param.GitGetter,
 		cd:                    param.Cd,
+		k8sutil:               param.K8sUtil,
 		applicationMgr:        param.ApplicationManager,
 		applicationSvc:        param.ApplicationSvc,
 		templateReleaseMgr:    param.TemplateReleaseManager,

diff --git a/core/controller/cluster/controller_basic.go b/core/controller/cluster/controller_basic.go
@@ -14,7 +14,7 @@ import (
 	"github.com/horizoncd/horizon/core/middleware/requestid"
 	"github.com/horizoncd/horizon/lib/q"
 	"github.com/horizoncd/horizon/pkg/application/models"
-	"github.com/horizoncd/horizon/pkg/cluster/cd"
+	"github.com/horizoncd/horizon/pkg/cd"
 	codemodels "github.com/horizoncd/horizon/pkg/cluster/code"
 	"github.com/horizoncd/horizon/pkg/cluster/gitrepo"
 	cmodels "github.com/horizoncd/horizon/pkg/cluster/models"

diff --git a/core/controller/cluster/controller_basic_test.go b/core/controller/cluster/controller_basic_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/horizoncd/horizon/core/common"
 	"github.com/horizoncd/horizon/lib/q"
-	mockcd "github.com/horizoncd/horizon/mock/pkg/cluster/cd"
+	mockcd "github.com/horizoncd/horizon/mock/pkg/cd"
 	appmodels "github.com/horizoncd/horizon/pkg/application/models"
 	applicationservice "github.com/horizoncd/horizon/pkg/application/service"
 	userauth "github.com/horizoncd/horizon/pkg/authentication/user"

diff --git a/core/controller/cluster/controller_basic_v2.go b/core/controller/cluster/controller_basic_v2.go
@@ -11,7 +11,7 @@ import (
 	herrors "github.com/horizoncd/horizon/core/errors"
 	appgitrepo "github.com/horizoncd/horizon/pkg/application/gitrepo"
 	appmodels "github.com/horizoncd/horizon/pkg/application/models"
-	"github.com/horizoncd/horizon/pkg/cluster/cd"
+	"github.com/horizoncd/horizon/pkg/cd"
 	"github.com/horizoncd/horizon/pkg/cluster/gitrepo"
 	collectionmodels "github.com/horizoncd/horizon/pkg/collection/models"
 	eventmodels "github.com/horizoncd/horizon/pkg/event/models"
@@ -63,7 +63,7 @@ func (c *controller) GetClusterStatusV2(ctx context.Context, clusterID uint) (*S
 	// If cluster not found on argo, check the cluster is freed or has not been published yet,
 	// or the cluster will be "notFound". If response's status field has not been set,
 	// set it with status from argocd.
-	cdStatus, err := c.cd.GetClusterStateV2(ctx, params)
+	cdStatus, err := c.cd.GetClusterState(ctx, params)
 	if err != nil {
 		if _, ok := perror.Cause(err).(*herrors.HorizonErrNotFound); !ok {
 			return nil, err

diff --git a/core/controller/cluster/controller_internal.go b/core/controller/cluster/controller_internal.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/horizoncd/horizon/core/common"
 	herrors "github.com/horizoncd/horizon/core/errors"
-	"github.com/horizoncd/horizon/pkg/cluster/cd"
+	"github.com/horizoncd/horizon/pkg/cd"
 	codemodels "github.com/horizoncd/horizon/pkg/cluster/code"
 	"github.com/horizoncd/horizon/pkg/cluster/gitrepo"
 	perror "github.com/horizoncd/horizon/pkg/errors"

diff --git a/core/controller/cluster/controller_internal_v2.go b/core/controller/cluster/controller_internal_v2.go
@@ -8,7 +8,7 @@ import (
 	"github.com/horizoncd/horizon/core/common"
 	herrors "github.com/horizoncd/horizon/core/errors"
 	userauth "github.com/horizoncd/horizon/pkg/authentication/user"
-	"github.com/horizoncd/horizon/pkg/cluster/cd"
+	"github.com/horizoncd/horizon/pkg/cd"
 	"github.com/horizoncd/horizon/pkg/cluster/gitrepo"
 	perror "github.com/horizoncd/horizon/pkg/errors"
 	eventmodels "github.com/horizoncd/horizon/pkg/event/models"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,10 @@ on: @@
       push:
         branches:
           - main
+        paths:
+          - "**.go"
+          - "!**_test.go"
+          - "build/**"
         tags:
           - v*
@@ Expand Down @@