list custom resource managed resources

cyclops-ctrl/.env

@@ -4,3 +4,4 @@ WATCH_NAMESPACE=cyclops
 WATCH_NAMESPACE_HELM=
 CYCLOPS_VERSION=v0.0.0
 MODULE_TARGET_NAMESPACE=
+CONFIG_PATH=config.yaml

cyclops-ctrl/api/v1alpha1/module_types.go

@@ -43,6 +43,7 @@ const (
 	TemplateSourceTypeGit  TemplateSourceType = "git"
 	TemplateSourceTypeHelm TemplateSourceType = "helm"
 	TemplateSourceTypeOCI  TemplateSourceType = "oci"
+	TemplateSourceTypeCRD  TemplateSourceType = "crd"
 
 	GitOpsWriteRepoAnnotation     = "cyclops-ui.com/write-repo"
 	GitOpsWritePathAnnotation     = "cyclops-ui.com/write-path"
@@ -55,11 +56,15 @@ const (
 )
 
 type TemplateRef struct {
-	URL     string `json:"repo"`
-	Path    string `json:"path"`
+	// +kubebuilder:validation:Optional
+	URL string `json:"repo"`
+	// +kubebuilder:validation:Optional
+	Path string `json:"path"`
+	// +kubebuilder:validation:Optional
 	Version string `json:"version"`
-
-	// +kubebuilder:validation:Enum=git;helm;oci
+	// +kubebuilder:validation:Optional
+	CRDName string `json:"CRDName"`
+	// +kubebuilder:validation:Enum=git;helm;oci;crd
 	// +kubebuilder:validation:Optional
 	SourceType TemplateSourceType `json:"sourceType,omitempty"`
 }
@@ -106,11 +111,16 @@ type ModuleStatus struct {
 }
 
 type HistoryTemplateRef struct {
-	URL     string `json:"repo"`
-	Path    string `json:"path"`
+	// +kubebuilder:validation:Optional
+	URL string `json:"repo"`
+	// +kubebuilder:validation:Optional
+	Path string `json:"path"`
+	// +kubebuilder:validation:Optional
 	Version string `json:"version"`
+	// +kubebuilder:validation:Optional
+	CRDName string `json:"CRDName"`
 
-	// +kubebuilder:validation:Enum=git;helm;oci
+	// +kubebuilder:validation:Enum=git;helm;oci;crd
 	// +kubebuilder:validation:Optional
 	SourceType TemplateSourceType `json:"sourceType,omitempty"`
 }

cyclops-ctrl/cmd/main/main.go

@@ -94,6 +94,7 @@ func main() {
 	templatesRepo := template.NewRepo(
 		credsResolver,
 		cache.NewInMemoryTemplatesCache(),
+		k8sClient,
 	)
 
 	monitor, err := prometheus.NewMonitor(setupLog)
@@ -128,7 +129,7 @@ func main() {
 		}),
 		Cache: ctrlCache.Options{
 			DefaultNamespaces: map[string]ctrlCache.Config{
-				watchNamespace: {},
+				getWatchNamespace(): {},
 			},
 		},
 	})

cyclops-ctrl/config.yaml

@@ -0,0 +1,13 @@
+childLabels:
+  - group: kro.run
+    version: v1alpha1
+    kind: Application
+    matchLabels:
+      kro.run/instance-name: "{{ .metadata.name }}"
+    managedGVKs:
+      - group: apps
+        version: v1
+        resource: deployments
+      - group: ""
+        version: v1
+        resource: services

cyclops-ctrl/config/crd/bases/cyclops-ui.com_modules.yaml

@@ -62,6 +62,8 @@ spec:
                   type: string
                 template:
                   properties:
+                    CRDName:
+                      type: string
                     path:
                       type: string
                     repo:
@@ -71,13 +73,10 @@ spec:
                       - git
                       - helm
                       - oci
+                      - crd
                       type: string
                     version:
                       type: string
-                  required:
-                  - path
-                  - repo
-                  - version
                   type: object
                 values:
                   x-kubernetes-preserve-unknown-fields: true
@@ -104,6 +103,8 @@ spec:
                 type: string
               template:
                 properties:
+                  CRDName:
+                    type: string
                   path:
                     type: string
                   repo:
@@ -113,13 +114,10 @@ spec:
                     - git
                     - helm
                     - oci
+                    - crd
                     type: string
                   version:
                     type: string
-                required:
-                - path
-                - repo
-                - version
                 type: object
               values:
                 x-kubernetes-preserve-unknown-fields: true

cyclops-ctrl/config/crd/bases/cyclops-ui.com_templatestores.yaml

@@ -55,6 +55,8 @@ spec:
             type: object
           spec:
             properties:
+              CRDName:
+                type: string
               path:
                 type: string
               repo:
@@ -64,13 +66,10 @@ spec:
                 - git
                 - helm
                 - oci
+                - crd
                 type: string
               version:
                 type: string
-            required:
-            - path
-            - repo
-            - version
             type: object
         type: object
     served: true

cyclops-ctrl/internal/controller/cluster.go

@@ -73,3 +73,21 @@ func (c *Cluster) ListNamespaces(ctx *gin.Context) {
 
 	ctx.JSON(http.StatusOK, namespaces)
 }
+
+func (c *Cluster) ListCRDs(ctx *gin.Context) {
+	ctx.Header("Access-Control-Allow-Origin", "*")
+
+	crds, err := c.kubernetesClient.ListCRDs()
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching namespaces", err.Error()))
+		return
+	}
+
+	crdNames := make([]string, 0)
+
+	for _, crd := range crds {
+		crdNames = append(crdNames, crd.Name)
+	}
+
+	ctx.JSON(http.StatusOK, crdNames)
+}

cyclops-ctrl/internal/controller/modules.go

@@ -201,6 +201,7 @@ func (m *Modules) Manifest(ctx *gin.Context) {
 		request.TemplateRef.Path,
 		request.TemplateRef.Version,
 		"",
+		request.TemplateRef.CRDName,
 		request.TemplateRef.SourceType,
 	)
 	if err != nil {
@@ -209,7 +210,7 @@ func (m *Modules) Manifest(ctx *gin.Context) {
 		return
 	}
 
-	manifest, err := m.renderer.HelmTemplate(v1alpha1.Module{
+	manifest, err := m.renderer.RenderManifest(v1alpha1.Module{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: ctx.Param("name"),
 		},
@@ -218,6 +219,7 @@ func (m *Modules) Manifest(ctx *gin.Context) {
 				URL:        request.TemplateRef.URL,
 				Path:       request.TemplateRef.Path,
 				Version:    request.TemplateRef.Version,
+				CRDName:    request.TemplateRef.CRDName,
 				SourceType: request.TemplateRef.SourceType,
 			},
 			Values: request.Values,
@@ -250,6 +252,7 @@ func (m *Modules) CurrentManifest(ctx *gin.Context) {
 		module.Spec.TemplateRef.Path,
 		module.Spec.TemplateRef.Version,
 		module.Status.TemplateResolvedVersion,
+		module.Spec.TemplateRef.CRDName,
 		module.Spec.TemplateRef.SourceType,
 	)
 	if err != nil {
@@ -258,7 +261,7 @@ func (m *Modules) CurrentManifest(ctx *gin.Context) {
 		return
 	}
 
-	manifest, err := m.renderer.HelmTemplate(*module, targetTemplate)
+	manifest, err := m.renderer.RenderManifest(*module, targetTemplate)
 	if err != nil {
 		fmt.Println(err)
 		ctx.Status(http.StatusInternalServerError)
@@ -420,6 +423,7 @@ func (m *Modules) UpdateModule(ctx *gin.Context) {
 			URL:        curr.Spec.TemplateRef.URL,
 			Path:       curr.Spec.TemplateRef.Path,
 			Version:    curr.Status.TemplateResolvedVersion,
+			CRDName:    curr.Spec.TemplateRef.CRDName,
 			SourceType: curr.Spec.TemplateRef.SourceType,
 		},
 		Values: curr.Spec.Values,
@@ -484,6 +488,7 @@ func (m *Modules) HistoryEntryManifest(ctx *gin.Context) {
 		targetGeneration.TemplateRef.Path,
 		targetGeneration.TemplateRef.Version,
 		"",
+		targetGeneration.TemplateRef.CRDName,
 		targetGeneration.TemplateRef.SourceType,
 	)
 	if err != nil {
@@ -492,7 +497,7 @@ func (m *Modules) HistoryEntryManifest(ctx *gin.Context) {
 		return
 	}
 
-	manifest, err := m.renderer.HelmTemplate(v1alpha1.Module{
+	manifest, err := m.renderer.RenderManifest(v1alpha1.Module{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: request.ModuleName,
 		},
@@ -656,6 +661,7 @@ func (m *Modules) ResourcesForModule(ctx *gin.Context) {
 		module.Spec.TemplateRef.Path,
 		templateVersion,
 		module.Status.TemplateResolvedVersion,
+		module.Spec.TemplateRef.CRDName,
 		module.Spec.TemplateRef.SourceType,
 	)
 	if err != nil {
@@ -670,7 +676,7 @@ func (m *Modules) ResourcesForModule(ctx *gin.Context) {
 		return
 	}
 
-	manifest, err := m.renderer.HelmTemplate(*module, t)
+	manifest, err := m.renderer.RenderManifest(*module, t)
 	if err != nil {
 		fmt.Println("error rendering manifest", err)
 		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error rendering Module manifest", err.Error()))
@@ -710,6 +716,7 @@ func (m *Modules) Template(ctx *gin.Context) {
 		module.Spec.TemplateRef.Path,
 		module.Spec.TemplateRef.Version,
 		module.Status.TemplateResolvedVersion,
+		module.Spec.TemplateRef.CRDName,
 		module.Spec.TemplateRef.SourceType,
 	)
 	if err != nil {
@@ -718,7 +725,7 @@ func (m *Modules) Template(ctx *gin.Context) {
 		return
 	}
 
-	currentManifest, err := m.renderer.HelmTemplate(*module, currentTemplate)
+	currentManifest, err := m.renderer.RenderManifest(*module, currentTemplate)
 	if err != nil {
 		fmt.Println(err)
 		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error templating current", err.Error()))
@@ -730,6 +737,7 @@ func (m *Modules) Template(ctx *gin.Context) {
 		module.Spec.TemplateRef.Path,
 		module.Spec.TemplateRef.Version,
 		module.Status.TemplateResolvedVersion,
+		module.Spec.TemplateRef.CRDName,
 		module.Spec.TemplateRef.SourceType,
 	)
 	if err != nil {
@@ -738,7 +746,7 @@ func (m *Modules) Template(ctx *gin.Context) {
 		return
 	}
 
-	proposedManifest, err := m.renderer.HelmTemplate(*module, proposedTemplate)
+	proposedManifest, err := m.renderer.RenderManifest(*module, proposedTemplate)
 	if err != nil {
 		fmt.Println(err)
 		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error templating proposed", err.Error()))
@@ -768,6 +776,7 @@ func (m *Modules) HelmTemplate(ctx *gin.Context) {
 		module.Spec.TemplateRef.Path,
 		module.Spec.TemplateRef.Version,
 		module.Status.TemplateResolvedVersion,
+		module.Spec.TemplateRef.CRDName,
 		module.Spec.TemplateRef.SourceType,
 	)
 	if err != nil {
@@ -776,7 +785,7 @@ func (m *Modules) HelmTemplate(ctx *gin.Context) {
 		return
 	}
 
-	_, err = m.renderer.HelmTemplate(*module, currentTemplate)
+	_, err = m.renderer.RenderManifest(*module, currentTemplate)
 	if err != nil {
 		fmt.Println(err)
 		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error templating", err.Error()))

cyclops-ctrl/internal/controller/sse/resources.go

@@ -35,6 +35,22 @@ func (s *Server) ReleaseResources(ctx *gin.Context) {
 	s.streamResources(ctx, resources)
 }
 
+func (s *Server) CRDResources(ctx *gin.Context) {
+	r, err := s.k8sClient.GetResource(ctx.Query("group"), ctx.Query("version"), ctx.Query("kind"), ctx.Query("name"), ctx.Query("namespace"))
+	if err != nil {
+		ctx.String(http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	other, ok := r.(*dto.Other)
+	if !ok {
+		ctx.String(http.StatusInternalServerError, "failed to fetch resource")
+		return
+	}
+
+	s.streamResources(ctx, other.Children)
+}
+
 func (s *Server) streamResources(ctx *gin.Context, resources []*dto.Resource) {
 	watchSpecs := make([]k8sclient.ResourceWatchSpec, 0, len(resources))
 	for _, resource := range resources {