Refactor with provided flux api

Signed-off-by: chengleqi <leqicheng@stu.xidian.edu.cn>
kubesphere · Aug 23, 2022 · 10ae430 · 10ae430
1 parent 0de3b98
commit 10ae430
Show file tree

Hide file tree

Showing 10 changed files with 762 additions and 1,405 deletions.
diff --git a/cmd/controller/app/server.go b/cmd/controller/app/server.go
@@ -19,6 +19,9 @@ package app
 import (
 	"context"
 	"fmt"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
+	kusv1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/jenkins-zh/jenkins-client/pkg/core"
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -176,6 +179,9 @@ func Run(s *options.DevOpsControllerManagerOptions, ctx context.Context) error {
 	}
 	apis.AddToScheme(mgr.GetScheme())
 	_ = apiextensions.AddToScheme(mgr.GetScheme())
+	_ = sourcev1.AddToScheme(mgr.GetScheme())
+	_ = kusv1.AddToScheme(mgr.GetScheme())
+	_ = helmv2.AddToScheme(mgr.GetScheme())
 
 	// register common meta types into schemas.
 	metav1.AddToGroupVersion(mgr.GetScheme(), metav1.SchemeGroupVersion)

diff --git a/config/crd/bases/gitops.kubesphere.io_applications.yaml b/config/crd/bases/gitops.kubesphere.io_applications.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -306,6 +306,7 @@ rules:
   - get
   - list
   - update
+  - watch
 - apiGroups:
   - kustomize.toolkit.fluxcd.io
   resources:
@@ -316,6 +317,7 @@ rules:
   - get
   - list
   - update
+  - watch
 - apiGroups:
   - source.toolkit.fluxcd.io
   resources:
@@ -334,3 +336,4 @@ rules:
   - create
   - get
   - list
+  - watch
diff --git a/config/samples/gitops/fluxcd-application-helmtemplate.yaml b/config/samples/gitops/fluxcd-application-helmtemplate.yaml
@@ -11,7 +11,7 @@ spec:
       config:
         helmRelease:
           chart:
-          template: my-devops-projecthmhx2-chengleqi-test-helm
+          template: chengleqi-test-helm
           deploy:
             - destination:
                 kubeConfig: