Write module config to Git source

cyclops-ctrl/api/v1alpha1/module_types.go

@@ -43,6 +43,10 @@ const (
 	TemplateSourceTypeGit  TemplateSourceType = "git"
 	TemplateSourceTypeHelm TemplateSourceType = "helm"
 	TemplateSourceTypeOCI  TemplateSourceType = "oci"
+
+	GitOpsWriteRepoAnnotation     = "cyclops-ui.com/write-repo"
+	GitOpsWritePathAnnotation     = "cyclops-ui.com/write-path"
+	GitOpsWriteRevisionAnnotation = "cyclops-ui.com/write-revision"
 )
 
 type TemplateRef struct {
@@ -88,12 +92,12 @@ type GroupVersionResource struct {
 
 // ModuleStatus defines the observed state of Module
 type ModuleStatus struct {
-	ReconciliationStatus    ReconciliationStatus `json:"reconciliationStatus"`
-	TemplateResolvedVersion string               `json:"templateResolvedVersion"`
+	ReconciliationStatus    *ReconciliationStatus `json:"reconciliationStatus,omitempty"`
+	TemplateResolvedVersion string                `json:"templateResolvedVersion,omitempty"`
 	// +kubebuilder:validation:Optional
-	ManagedGVRs []GroupVersionResource `json:"managedGVRs"`
+	ManagedGVRs []GroupVersionResource `json:"managedGVRs,omitempty"`
 	// +kubebuilder:validation:Optional
-	IconURL string `json:"iconURL"`
+	IconURL string `json:"iconURL,omitempty"`
 }
 
 type HistoryTemplateRef struct {

cyclops-ctrl/cmd/main/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/git"
 	"os"
 	"strconv"
 	"time"
@@ -86,8 +87,10 @@ func main() {
 		panic(err)
 	}
 
+	credsResolver := auth.NewTemplatesResolver(k8sClient)
+
 	templatesRepo := template.NewRepo(
-		auth.NewTemplatesResolver(k8sClient),
+		credsResolver,
 		cache.NewInMemoryTemplatesCache(),
 	)
 
@@ -101,8 +104,9 @@ func main() {
 	prometheus.StartCacheMetricsUpdater(&monitor, templatesRepo.ReturnCache(), 10*time.Second, setupLog)
 
 	helmReleaseClient := helm.NewReleaseClient(helmWatchNamespace)
+	gitWriteClient := git.NewWriteClient(credsResolver, getCommitMessageTemplate(), setupLog)
 
-	handler, err := handler.New(templatesRepo, k8sClient, helmReleaseClient, renderer, moduleTargetNamespace, telemetryClient, monitor)
+	handler, err := handler.New(templatesRepo, k8sClient, helmReleaseClient, renderer, gitWriteClient, moduleTargetNamespace, telemetryClient, monitor)
 	if err != nil {
 		panic(err)
 	}
@@ -192,3 +196,7 @@ func getHelmWatchNamespace() string {
 	}
 	return value
 }
+
+func getCommitMessageTemplate() string {
+	return os.Getenv("COMMIT_MESSAGE_TEMPLATE")
+}

cyclops-ctrl/internal/controller/modules.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/git"
+
 	"sigs.k8s.io/yaml"
 
 	"github.com/gin-gonic/gin"
@@ -27,6 +29,7 @@ type Modules struct {
 	kubernetesClient k8sclient.IKubernetesClient
 	templatesRepo    template.ITemplateRepo
 	renderer         *render.Renderer
+	gitWriteClient   *git.WriteClient
 
 	moduleTargetNamespace string
 
@@ -38,6 +41,7 @@ func NewModulesController(
 	templatesRepo template.ITemplateRepo,
 	kubernetes k8sclient.IKubernetesClient,
 	renderer *render.Renderer,
+	gitWriteClient *git.WriteClient,
 	moduleTargetNamespace string,
 	telemetryClient telemetry.Client,
 	monitor prometheus.Monitor,
@@ -46,6 +50,7 @@ func NewModulesController(
 		kubernetesClient:      kubernetes,
 		templatesRepo:         templatesRepo,
 		renderer:              renderer,
+		gitWriteClient:        gitWriteClient,
 		moduleTargetNamespace: moduleTargetNamespace,
 		telemetryClient:       telemetryClient,
 		monitor:               monitor,
@@ -126,6 +131,31 @@ func (m *Modules) ListModules(ctx *gin.Context) {
 
 func (m *Modules) DeleteModule(ctx *gin.Context) {
 	ctx.Header("Access-Control-Allow-Origin", "*")
+	m.monitor.DecModule()
+
+	deleteMethod := ctx.Query("deleteMethod")
+
+	if deleteMethod == "git" {
+		module, err := m.kubernetesClient.GetModule(ctx.Param("name"))
+		if err != nil {
+			ctx.JSON(http.StatusBadRequest, dto.NewError("Error fetching module for deletion", err.Error()))
+			return
+		}
+
+		if module == nil {
+			ctx.JSON(http.StatusBadRequest, dto.NewError("Error fetching module for deletion", "Check that the module exists"))
+			return
+		}
+
+		err = m.gitWriteClient.DeleteModule(*module)
+		if err != nil {
+			ctx.JSON(http.StatusBadRequest, dto.NewError("Error deleting module from git", err.Error()))
+			return
+		}
+
+		ctx.Status(http.StatusOK)
+		return
+	}
 
 	err := m.kubernetesClient.DeleteModule(ctx.Param("name"))
 	if err != nil {
@@ -134,7 +164,6 @@ func (m *Modules) DeleteModule(ctx *gin.Context) {
 		return
 	}
 
-	m.monitor.DecModule()
 	ctx.Status(http.StatusOK)
 }
 
@@ -279,6 +308,15 @@ func (m *Modules) CreateModule(ctx *gin.Context) {
 
 	m.telemetryClient.ModuleCreation()
 
+	if module.GetAnnotations() != nil && len(module.GetAnnotations()[v1alpha1.GitOpsWriteRepoAnnotation]) != 0 {
+		err := m.gitWriteClient.Write(module)
+		if err != nil {
+			fmt.Println(err)
+			ctx.JSON(http.StatusInternalServerError, dto.NewError("Error pushing to git", err.Error()))
+		}
+		return
+	}
+
 	err = m.kubernetesClient.CreateModule(module)
 	if err != nil {
 		fmt.Println(err)
@@ -314,6 +352,57 @@ func (m *Modules) UpdateModule(ctx *gin.Context) {
 		return
 	}
 
+	module.Spec.TemplateRef.SourceType = curr.Spec.TemplateRef.SourceType
+
+	module.Status.TemplateResolvedVersion = request.Template.ResolvedVersion
+	module.Status.ReconciliationStatus = curr.Status.ReconciliationStatus
+	module.Status.IconURL = curr.Status.IconURL
+	module.Status.ManagedGVRs = curr.Status.ManagedGVRs
+
+	module.Spec.TargetNamespace = curr.Spec.TargetNamespace
+	module.SetLabels(curr.GetLabels())
+
+	annotations := curr.GetAnnotations()
+	moduleAnnotations := module.GetAnnotations()
+
+	if annotations == nil {
+		annotations = make(map[string]string)
+	}
+
+	if moduleAnnotations != nil {
+		if _, ok := moduleAnnotations["cyclops-ui.com/write-repo"]; ok {
+			annotations["cyclops-ui.com/write-repo"] = moduleAnnotations["cyclops-ui.com/write-repo"]
+		}
+		if _, ok := moduleAnnotations["cyclops-ui.com/write-path"]; ok {
+			annotations["cyclops-ui.com/write-path"] = moduleAnnotations["cyclops-ui.com/write-path"]
+		}
+		if _, ok := moduleAnnotations["cyclops-ui.com/write-revision"]; ok {
+			annotations["cyclops-ui.com/write-revision"] = moduleAnnotations["cyclops-ui.com/write-revision"]
+		}
+	}
+
+	if len(moduleAnnotations) == 0 || len(moduleAnnotations[v1alpha1.GitOpsWriteRepoAnnotation]) == 0 {
+		delete(annotations, v1alpha1.GitOpsWriteRepoAnnotation)
+	}
+	if len(moduleAnnotations) == 0 || len(moduleAnnotations[v1alpha1.GitOpsWritePathAnnotation]) == 0 {
+		delete(annotations, v1alpha1.GitOpsWritePathAnnotation)
+	}
+	if len(moduleAnnotations) == 0 || len(moduleAnnotations[v1alpha1.GitOpsWriteRevisionAnnotation]) == 0 {
+		delete(annotations, v1alpha1.GitOpsWriteRevisionAnnotation)
+	}
+
+	delete(annotations, "kubectl.kubernetes.io/last-applied-configuration")
+	module.SetAnnotations(annotations)
+
+	if len(module.GetAnnotations()[v1alpha1.GitOpsWriteRepoAnnotation]) != 0 {
+		err := m.gitWriteClient.Write(module)
+		if err != nil {
+			fmt.Println(err)
+			ctx.JSON(http.StatusInternalServerError, dto.NewError("Error pushing to git", err.Error()))
+		}
+		return
+	}
+
 	history := curr.History
 	if curr.History == nil {
 		history = make([]v1alpha1.HistoryEntry, 0)
@@ -336,16 +425,6 @@ func (m *Modules) UpdateModule(ctx *gin.Context) {
 
 	module.SetResourceVersion(curr.GetResourceVersion())
 
-	module.Spec.TemplateRef.SourceType = curr.Spec.TemplateRef.SourceType
-
-	module.Status.TemplateResolvedVersion = request.Template.ResolvedVersion
-	module.Status.ReconciliationStatus = curr.Status.ReconciliationStatus
-	module.Status.IconURL = curr.Status.IconURL
-	module.Status.ManagedGVRs = curr.Status.ManagedGVRs
-
-	module.Spec.TargetNamespace = curr.Spec.TargetNamespace
-	module.SetLabels(curr.GetLabels())
-
 	result, err := m.kubernetesClient.UpdateModuleStatus(&module)
 	if err != nil {
 		fmt.Println(err)