Add FluxCD Application Management (#743)

kubesphere · Aug 25, 2022 · 5a189fa · 5a189fa
1 parent f45b22d
commit 5a189fa
Show file tree

Hide file tree

Showing 34 changed files with 6,208 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -51,7 +51,8 @@ deploy: manifests
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=ks-devops webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=ks-devops webhook paths="./pkg/api/..." output:crd:artifacts:config=config/crd/bases output:rbac:none
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=ks-devops webhook paths="./..." output:crd:none
 
 install-crd:
 	kubectl apply -f config/crd/bases

diff --git a/cmd/controller/app/controllers.go b/cmd/controller/app/controllers.go
@@ -133,6 +133,10 @@ func getAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i
 		TargetConfigMapNamespace: s.FeatureOptions.SystemNamespace,
 	}
 
+	fluxcdApplicationReconciler := &fluxcd.ApplicationReconciler{
+		Client: mgr.GetClient(),
+	}
+
 	return map[string]func(mgr manager.Manager) error{
 		gitRepoReconcilers.GetName(): func(mgr manager.Manager) error {
 			return gitRepoReconcilers.SetupWithManager(mgr)
@@ -214,8 +218,11 @@ func getAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i
 		argcdImageUpdaterReconciler.GetGroupName() + "-image-updater": func(mgr manager.Manager) error {
 			return argcdImageUpdaterReconciler.SetupWithManager(mgr)
 		},
-		"fluxcd": func(mgr manager.Manager) error {
-			return fluxcdGitRepoReconciler.SetupWithManager(mgr)
+		fluxcdApplicationReconciler.GetGroupName(): func(mgr manager.Manager) (err error) {
+			if err = fluxcdGitRepoReconciler.SetupWithManager(mgr); err != nil {
+				return
+			}
+			return fluxcdApplicationReconciler.SetupWithManager(mgr)
 		},
 	}
 }
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
@@ -296,6 +296,28 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - helm.toolkit.fluxcd.io
+  resources:
+  - helmreleases
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - kustomize.toolkit.fluxcd.io
+  resources:
+  - kustomizations
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - source.toolkit.fluxcd.io
   resources:
@@ -306,3 +328,12 @@ rules:
   - get
   - list
   - update
+- apiGroups:
+  - source.toolkit.fluxcd.io
+  resources:
+  - helmcharts
+  verbs:
+  - create
+  - get
+  - list
+  - watch
diff --git a/config/samples/gitops/fluxcd-application-helmrelease.yaml b/config/samples/gitops/fluxcd-application-helmrelease.yaml
@@ -0,0 +1,48 @@
+apiVersion: gitops.kubesphere.io/v1alpha1
+kind: Application
+metadata:
+  name: chengleqi-test-helm
+  namespace: my-devops-projecthmhx2
+  labels:
+    gitops.kubesphere.io/save-helm-template: "true"
+spec:
+  kind: fluxcd
+  fluxApp:
+    spec:
+      source:
+        sourceRef:
+          kind: GitRepository
+          name: fluxcd-github-repo
+          namespace: my-devops-projecthmhx2
+      config:
+        helmRelease:
+          chart:
+            interval: 5m0s
+            chart: ./helm-chart
+            version: "0.1.0"
+            valuesFiles:
+              - ./helm-chart/values.yaml
+              - ./helm-chart/aliyun-values.yaml
+            reconcileStrategy: Revision
+          template:
+          deploy:
+            - destination:
+                kubeConfig:
+                targetNamespace: helm-app
+              interval: 1m0s
+              upgrade:
+                remediation:
+                  remediateLastFailure: true
+                force: true
+              install:
+                createNamespace: true
+            - destination:
+                kubeConfig:
+                targetNamespace: another-helm-app
+              interval: 1m0s
+              upgrade:
+                remediation:
+                  remediateLastFailure: true
+                force: true
+              install:
+                createNamespace: true
diff --git a/config/samples/gitops/fluxcd-application-helmtemplate.yaml b/config/samples/gitops/fluxcd-application-helmtemplate.yaml
@@ -0,0 +1,25 @@
+apiVersion: gitops.kubesphere.io/v1alpha1
+kind: Application
+metadata:
+  name: chengleqi-test-template
+  namespace: my-devops-projecthmhx2
+spec:
+  kind: fluxcd
+  fluxApp:
+    spec:
+      source:
+      config:
+        helmRelease:
+          chart:
+          template: chengleqi-test-helm
+          deploy:
+            - destination:
+                kubeConfig:
+                targetNamespace: template-app
+              interval: 1m0s
+              upgrade:
+                remediation:
+                  remediateLastFailure: true
+                force: true
+              install:
+                createNamespace: true
diff --git a/config/samples/gitops/fluxcd-application-kustomization.yaml b/config/samples/gitops/fluxcd-application-kustomization.yaml
@@ -0,0 +1,22 @@
+apiVersion: gitops.kubesphere.io/v1alpha1
+kind: Application
+metadata:
+  name: chengleqi-test-kus
+  namespace: my-devops-projecthmhx2
+spec:
+  kind: fluxcd
+  fluxApp:
+    spec:
+      source:
+        sourceRef:
+          kind: GitRepository
+          name: fluxcd-gitee-repo
+          namespace: my-devops-projecthmhx2
+      config:
+        kustomization:
+          - destination:
+              kubeConfig:
+              targetNamespace: default
+            interval: 8m0s
+            prune: true
+            path: "nginx"