[dashboard] Cumulative fixes (#1463)

- **[dashboard] Fix API group for the applications** - **fix sidebars** - **Introduce module parameter** - **fix keysAndTags for info** - **always prefill name in dashboard** - **Add factory for ingress resources** - **Add formated tables for tenantnamespaces**  ## What this PR does ### Release note  ```release-note [] ```  ## Summary by CodeRabbit - New Features - Module-aware dashboards: module resources are grouped under “Modules” in the sidebar and shown as “Tenant Modules” in breadcrumbs. - New Kubernetes details views for Services, Secrets, and Ingresses with enriched tabs and ingress rules. - Improvements - Marketplace hides module resources to reduce clutter. - Consistent navigation and links aligned to tenant namespaces. - Sidebars expanded with additional built-in Kubernetes entries and per-resource detail sidebars. - Custom forms now always prefill the name field for smoother creation flows.
2026-01-27 18:18:41 +00:00 · 2025-09-25 20:10:10 +02:00
parent d52a2fbe94 364cba3100
commit 28cd5bebf2
15 changed files with 319 additions and 129 deletions
--- a/api/v1alpha1/cozystackresourcedefinitions_types.go
+++ b/api/v1alpha1/cozystackresourcedefinitions_types.go
@@ -153,4 +153,7 @@ type CozystackResourceDefinitionDashboard struct {
 	// Order of keys in the YAML view
 	// +optional
 	KeysOrder [][]string `json:"keysOrder,omitempty"`
+	// Whether this resource is a module (tenant module)
+	// +optional
+	Module bool `json:"module,omitempty"`
 }
--- a/internal/controller/dashboard/breadcrumb.go
+++ b/internal/controller/dashboard/breadcrumb.go
@@ -34,9 +34,8 @@ func (m *Manager) ensureBreadcrumb(ctx context.Context, crd *cozyv1alpha1.Cozyst
 	key := plural // e.g., "virtualmachines"
 	label := labelPlural
 	link := fmt.Sprintf("/openapi-ui/{clusterName}/{namespace}/api-table/%s/%s/%s", strings.ToLower(group), strings.ToLower(version), plural)
-	// If Name is set, change the first breadcrumb item to "Tenant Modules"
-	// TODO add parameter to this
-	if crd.Spec.Dashboard != nil && strings.TrimSpace(crd.Spec.Dashboard.Name) != "" {
+	// If this is a module, change the first breadcrumb item to "Tenant Modules"
+	if crd.Spec.Dashboard != nil && crd.Spec.Dashboard.Module {
 		key = "tenantmodules"
 		label = "Tenant Modules"
 		link = "/openapi-ui/{clusterName}/{namespace}/api-table/core.cozystack.io/v1alpha1/tenantmodules"
--- a/internal/controller/dashboard/customformsprefill.go
+++ b/internal/controller/dashboard/customformsprefill.go
@@ -31,15 +31,17 @@ func (m *Manager) ensureCustomFormsPrefill(ctx context.Context, crd *cozyv1alpha
 		return reconcile.Result{}, err
 	}

-	// If Name is set, prefill metadata.name
-	if crd.Spec.Dashboard != nil && strings.TrimSpace(crd.Spec.Dashboard.Name) != "" {
-		values = append([]interface{}{
-			map[string]interface{}{
-				"path":  toIfaceSlice([]string{"metadata", "name"}),
-				"value": crd.Spec.Dashboard.Name,
-			},
-		}, values...)
+	// Always prefill metadata.name (empty string if not specified in CRD)
+	var nameValue string
+	if crd.Spec.Dashboard != nil {
+		nameValue = strings.TrimSpace(crd.Spec.Dashboard.Name)
 	}
+	values = append([]interface{}{
+		map[string]interface{}{
+			"path":  toIfaceSlice([]string{"metadata", "name"}),
+			"value": nameValue,
+		},
+	}, values...)

 	cfp := &dashv1alpha1.CustomFormsPrefill{}
 	cfp.Name = name // cluster-scoped
--- a/internal/controller/dashboard/helpers.go
+++ b/internal/controller/dashboard/helpers.go
@@ -32,22 +32,11 @@ func pickGVK(crd *cozyv1alpha1.CozystackResourceDefinition) (group, version, kin
 		kind = crd.Spec.Application.Kind
 	}

-	// Parse crd.APIVersion to get group and version (format: "group/version")
-	if crd.APIVersion != "" {
-		parts := strings.Split(crd.APIVersion, "/")
-		if len(parts) == 2 {
-			group = parts[0]
-			version = parts[1]
-		}
-	}
+	// For applications, always use apps.cozystack.io group, not the CRD's own group
+	group = "apps.cozystack.io"
+	version = "v1alpha1"

 	// Reasonable fallbacks if any are empty:
-	if group == "" {
-		group = "apps.cozystack.io"
-	}
-	if version == "" {
-		version = "v1alpha1"
-	}
 	if kind == "" {
 		kind = "Resource"
 	}
--- a/internal/controller/dashboard/manager.go
+++ b/internal/controller/dashboard/manager.go
@@ -12,6 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"

 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )

@@ -245,29 +246,29 @@ func (m *Manager) buildExpectedResourceSet(crds []cozyv1alpha1.CozystackResource
 			continue
 		}

-		// Skip resources with non-empty spec.dashboard.name (tenant modules)
-		if strings.TrimSpace(crd.Spec.Dashboard.Name) != "" {
-			continue
-		}
+		// Note: We include ALL resources with dashboard config, regardless of module flag
+		// because ensureFactory and ensureBreadcrumb create resources for all CRDs with dashboard config

 		g, v, kind := pickGVK(&crd)
 		plural := pickPlural(kind, &crd)

-		// CustomColumnsOverride
+		// CustomColumnsOverride - created for ALL CRDs with dashboard config
 		name := fmt.Sprintf("stock-namespace-%s.%s.%s", g, v, plural)
 		expected["CustomColumnsOverride"][name] = true

-		// CustomFormsOverride
+		// CustomFormsOverride - created for ALL CRDs with dashboard config
 		name = fmt.Sprintf("%s.%s.%s", g, v, plural)
 		expected["CustomFormsOverride"][name] = true

-		// CustomFormsPrefill
+		// CustomFormsPrefill - created for ALL CRDs with dashboard config
 		expected["CustomFormsPrefill"][name] = true

-		// MarketplacePanel (name matches CRD name)
-		expected["MarketplacePanel"][crd.Name] = true
+		// MarketplacePanel - only created for non-module CRDs
+		if !crd.Spec.Dashboard.Module {
+			expected["MarketplacePanel"][crd.Name] = true
+		}

-		// Sidebar resources (multiple per CRD)
+		// Sidebar resources - created for ALL CRDs with dashboard config
 		lowerKind := strings.ToLower(kind)
 		detailsID := fmt.Sprintf("stock-project-factory-%s-details", lowerKind)
 		expected["Sidebar"][detailsID] = true
@@ -291,15 +292,15 @@ func (m *Manager) buildExpectedResourceSet(crds []cozyv1alpha1.CozystackResource
 			expected["Sidebar"][sidebarID] = true
 		}

-		// TableUriMapping
+		// TableUriMapping - created for ALL CRDs with dashboard config
 		name = fmt.Sprintf("stock-namespace-%s.%s.%s", g, v, plural)
 		expected["TableUriMapping"][name] = true

-		// Breadcrumb
+		// Breadcrumb - created for ALL CRDs with dashboard config
 		detailID := fmt.Sprintf("stock-project-factory-%s-details", lowerKind)
 		expected["Breadcrumb"][detailID] = true

-		// Factory
+		// Factory - created for ALL CRDs with dashboard config
 		factoryName := fmt.Sprintf("%s-details", lowerKind)
 		expected["Factory"][factoryName] = true
 	}
@@ -423,22 +424,24 @@ func (m *Manager) cleanupResourceType(ctx context.Context, resourceType client.O
 	case *dashv1alpha1.BreadcrumbList:
 		for _, item := range l.Items {
 			if !expected[item.Name] {
+				logger := log.FromContext(ctx)
+				logger.Info("Deleting orphaned Breadcrumb resource", "name", item.Name)
 				if err := m.client.Delete(ctx, &item); err != nil {
 					if !apierrors.IsNotFound(err) {
 						return err
 					}
-					// Resource already deleted, continue
 				}
 			}
 		}
 	case *dashv1alpha1.FactoryList:
 		for _, item := range l.Items {
 			if !expected[item.Name] {
+				logger := log.FromContext(ctx)
+				logger.Info("Deleting orphaned Factory resource", "name", item.Name)
 				if err := m.client.Delete(ctx, &item); err != nil {
 					if !apierrors.IsNotFound(err) {
 						return err
 					}
-					// Resource already deleted, continue
 				}
 			}
 		}
--- a/internal/controller/dashboard/marketplacepanel.go
+++ b/internal/controller/dashboard/marketplacepanel.go
@@ -3,7 +3,6 @@ package dashboard
 import (
 	"context"
 	"encoding/json"
-	"strings"

 	dashv1alpha1 "github.com/cozystack/cozystack/api/dashboard/v1alpha1"
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
@@ -39,8 +38,8 @@ func (m *Manager) ensureMarketplacePanel(ctx context.Context, crd *cozyv1alpha1.
 		return reconcile.Result{}, nil
 	}

-	// Skip resources with non-empty spec.dashboard.name
-	if strings.TrimSpace(crd.Spec.Dashboard.Name) != "" {
+	// Skip module resources (they don't need MarketplacePanel)
+	if crd.Spec.Dashboard.Module {
 		err := m.client.Get(ctx, client.ObjectKey{Name: mp.Name}, mp)
 		if apierrors.IsNotFound(err) {
 			return reconcile.Result{}, nil
@@ -51,7 +50,7 @@ func (m *Manager) ensureMarketplacePanel(ctx context.Context, crd *cozyv1alpha1.
 		if err := m.client.Delete(ctx, mp); err != nil && !apierrors.IsNotFound(err) {
 			return reconcile.Result{}, err
 		}
-		logger.Info("Deleted MarketplacePanel because spec.dashboard.name is set", "name", mp.Name)
+		logger.Info("Deleted MarketplacePanel because resource is a module", "name", mp.Name)
 		return reconcile.Result{}, nil
 	}

--- a/internal/controller/dashboard/sidebar.go
+++ b/internal/controller/dashboard/sidebar.go
@@ -57,6 +57,9 @@ func (m *Manager) ensureSidebar(ctx context.Context, crd *cozyv1alpha1.Cozystack
 	categories := map[string][]item{} // category label -> children
 	keysAndTags := map[string]any{}   // plural -> []string{ "<lower(kind)>-sidebar" }

+	// Collect sidebar names for module resources
+	var moduleSidebars []any
+
 	for i := range all {
 		def := &all[i]

@@ -65,37 +68,58 @@ func (m *Manager) ensureSidebar(ctx context.Context, crd *cozyv1alpha1.Cozystack
 			continue
 		}

-		// Skip resources with non-empty spec.dashboard.name
-		if strings.TrimSpace(def.Spec.Dashboard.Name) != "" {
-			continue
-		}
-
 		g, v, kind := pickGVK(def)
 		plural := pickPlural(kind, def)
-		cat := safeCategory(def) // falls back to "Resources" if empty
+		lowerKind := strings.ToLower(kind)

-		// Label: prefer dashboard.Plural if provided
-		label := titleFromKindPlural(kind, plural)
-		if def.Spec.Dashboard.Plural != "" {
-			label = def.Spec.Dashboard.Plural
+		// Check if this resource is a module
+		if def.Spec.Dashboard.Module {
+			// Special case: info should have its own keysAndTags, not be in modules
+			if lowerKind == "info" {
+				keysAndTags[plural] = []any{fmt.Sprintf("%s-sidebar", lowerKind)}
+			} else {
+				// Add to modules sidebar list
+				moduleSidebars = append(moduleSidebars, fmt.Sprintf("%s-sidebar", lowerKind))
+			}
+		} else {
+			// Add to keysAndTags for non-module resources
+			keysAndTags[plural] = []any{fmt.Sprintf("%s-sidebar", lowerKind)}
 		}

-		// Weight (default 0)
-		weight := def.Spec.Dashboard.Weight
+		// Only add to menu categories if not a module
+		if !def.Spec.Dashboard.Module {
+			cat := safeCategory(def) // falls back to "Resources" if empty

-		link := fmt.Sprintf("/openapi-ui/{clusterName}/{namespace}/api-table/%s/%s/%s", g, v, plural)
+			// Label: prefer dashboard.Plural if provided
+			label := titleFromKindPlural(kind, plural)
+			if def.Spec.Dashboard.Plural != "" {
+				label = def.Spec.Dashboard.Plural
+			}

-		categories[cat] = append(categories[cat], item{
-			Key:    plural,
-			Label:  label,
-			Link:   link,
-			Weight: weight,
-		})
+			// Weight (default 0)
+			weight := def.Spec.Dashboard.Weight

-		// keysAndTags: plural -> [ "<lower(kind)>-sidebar" ]
-		keysAndTags[plural] = []any{fmt.Sprintf("%s-sidebar", strings.ToLower(kind))}
+			link := fmt.Sprintf("/openapi-ui/{clusterName}/{namespace}/api-table/%s/%s/%s", g, v, plural)
+
+			categories[cat] = append(categories[cat], item{
+				Key:    plural,
+				Label:  label,
+				Link:   link,
+				Weight: weight,
+			})
+		}
 	}

+	// Add modules to keysAndTags if we have any module sidebars
+	if len(moduleSidebars) > 0 {
+		keysAndTags["modules"] = moduleSidebars
+	}
+
+	// Add sidebars for built-in Kubernetes resources
+	keysAndTags["services"] = []any{"service-sidebar"}
+	keysAndTags["secrets"] = []any{"secret-sidebar"}
+	keysAndTags["ingresses"] = []any{"ingress-sidebar"}
+
 	// 3) Sort items within each category by Weight (desc), then Label (A→Z)
 	for cat := range categories {
 		sort.Slice(categories[cat], func(i, j int) bool {
@@ -171,14 +195,8 @@ func (m *Manager) ensureSidebar(ctx context.Context, crd *cozyv1alpha1.Cozystack
 	})

 	// 6) Prepare the list of Sidebar IDs to upsert with the SAME content
-	_, _, thisKind := pickGVK(crd)
-	lowerThisKind := strings.ToLower(thisKind)
-	detailsID := fmt.Sprintf("stock-project-factory-%s-details", lowerThisKind)
-
+	// Create sidebars for ALL CRDs with dashboard config
 	targetIDs := []string{
-		// original details sidebar
-		detailsID,
-
 		// stock-instance sidebars
 		"stock-instance-api-form",
 		"stock-instance-api-table",
@@ -188,6 +206,9 @@ func (m *Manager) ensureSidebar(ctx context.Context, crd *cozyv1alpha1.Cozystack
 		// stock-project sidebars
 		"stock-project-factory-marketplace",
 		"stock-project-factory-workloadmonitor-details",
+		"stock-project-factory-kube-service-details",
+		"stock-project-factory-kube-secret-details",
+		"stock-project-factory-kube-ingress-details",
 		"stock-project-api-form",
 		"stock-project-api-table",
 		"stock-project-builtin-form",
@@ -196,6 +217,18 @@ func (m *Manager) ensureSidebar(ctx context.Context, crd *cozyv1alpha1.Cozystack
 		"stock-project-crd-table",
 	}

+	// Add details sidebars for all CRDs with dashboard config
+	for i := range all {
+		def := &all[i]
+		if def.Spec.Dashboard == nil {
+			continue
+		}
+		_, _, kind := pickGVK(def)
+		lowerKind := strings.ToLower(kind)
+		detailsID := fmt.Sprintf("stock-project-factory-%s-details", lowerKind)
+		targetIDs = append(targetIDs, detailsID)
+	}
+
 	// 7) Upsert all target sidebars with identical menuItems and keysAndTags
 	return m.upsertMultipleSidebars(ctx, crd, targetIDs, keysAndTags, menuItems)
 }
@@ -219,11 +252,35 @@ func (m *Manager) upsertMultipleSidebars(
 		obj.SetName(id)

 		if _, err := controllerutil.CreateOrUpdate(ctx, m.client, obj, func() error {
-			if err := controllerutil.SetOwnerReference(crd, obj, m.scheme); err != nil {
-				return err
+			// Only set owner reference for dynamic sidebars (stock-project-factory-{kind}-details)
+			// Static sidebars (stock-instance-*, stock-project-*) should not have owner references
+			if strings.HasPrefix(id, "stock-project-factory-") && strings.HasSuffix(id, "-details") {
+				// This is a dynamic sidebar, set owner reference only if it matches the current CRD
+				_, _, kind := pickGVK(crd)
+				lowerKind := strings.ToLower(kind)
+				expectedID := fmt.Sprintf("stock-project-factory-%s-details", lowerKind)
+				if id == expectedID {
+					if err := controllerutil.SetOwnerReference(crd, obj, m.scheme); err != nil {
+						return err
+					}
+					// Add dashboard labels to dynamic resources
+					m.addDashboardLabels(obj, crd, ResourceTypeDynamic)
+				} else {
+					// This is a different CRD's sidebar, don't modify owner references or labels
+					// Just update the spec
+				}
+			} else {
+				// This is a static sidebar, don't set owner references
+				// Add static labels
+				labels := obj.GetLabels()
+				if labels == nil {
+					labels = make(map[string]string)
+				}
+				labels[LabelManagedBy] = ManagedByValue
+				labels[LabelResourceType] = ResourceTypeStatic
+				obj.SetLabels(labels)
 			}
-			// Add dashboard labels to dynamic resources
-			m.addDashboardLabels(obj, crd, ResourceTypeDynamic)
+
 			b, err := json.Marshal(spec)
 			if err != nil {
 				return err
--- a/internal/controller/dashboard/static_helpers.go
+++ b/internal/controller/dashboard/static_helpers.go
@@ -172,7 +172,7 @@ func createCustomColumnsOverride(id string, additionalPrinterColumns []any) *das
 		}
 	}

-	if name == "factory-ingress-details-rules" {
+	if name == "factory-kube-ingress-details-rules" {
 		data["additionalPrinterColumnsUndefinedValues"] = []any{
 			map[string]any{
 				"key":   "Service",
@@ -687,10 +687,10 @@ func getTabsId(key string) string {
 	if key == "workloadmonitor-details" {
 		return "workloadmonitor-tabs"
 	}
-	if key == "secret-details" {
+	if key == "kube-secret-details" {
 		return "secret-tabs"
 	}
-	if key == "service-details" {
+	if key == "kube-service-details" {
 		return "service-tabs"
 	}
 	return strings.ToLower(key) + "-tabs"
--- a/internal/controller/dashboard/static_refactored.go
+++ b/internal/controller/dashboard/static_refactored.go
@@ -40,17 +40,23 @@ func CreateAllBreadcrumbs() []*dashboardv1alpha1.Breadcrumb {
 		}),

 		// Stock project factory secret details
-		createBreadcrumb("stock-project-factory-secret-details", []map[string]any{
+		createBreadcrumb("stock-project-factory-kube-secret-details", []map[string]any{
 			createBreadcrumbItem("secrets", "v1/secrets", "/openapi-ui/{clusterName}/{namespace}/builtin-table/secrets"),
 			createBreadcrumbItem("secret", "{6}"),
 		}),

 		// Stock project factory service details
-		createBreadcrumb("stock-project-factory-service-details", []map[string]any{
+		createBreadcrumb("stock-project-factory-kube-service-details", []map[string]any{
 			createBreadcrumbItem("services", "v1/services", "/openapi-ui/{clusterName}/{namespace}/builtin-table/services"),
 			createBreadcrumbItem("service", "{6}"),
 		}),

+		// Stock project factory ingress details
+		createBreadcrumb("stock-project-factory-kube-ingress-details", []map[string]any{
+			createBreadcrumbItem("ingresses", "networking.k8s.io/v1/ingresses", "/openapi-ui/{clusterName}/{namespace}/builtin-table/ingresses"),
+			createBreadcrumbItem("ingress", "{6}"),
+		}),
+
 		// Stock cluster api table
 		createBreadcrumb("stock-cluster-api-table", []map[string]any{
 			createBreadcrumbItem("api", "{apiGroup}/{apiVersion}/{typeName}"),
@@ -126,7 +132,7 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid
 	return []*dashboardv1alpha1.CustomColumnsOverride{
 		// Factory details v1 services
 		createCustomColumnsOverride("factory-details-v1.services", []any{
-			createCustomColumnWithSpecificColor("Name", "Service", "service", getColorForType("service"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/service-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
+			createCustomColumnWithSpecificColor("Name", "Service", "service", getColorForType("service"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-service-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
 			createStringColumn("ClusterIP", ".spec.clusterIP"),
 			createStringColumn("LoadbalancerIP", ".spec.loadBalancerIP"),
 			createTimestampColumn("Created", ".metadata.creationTimestamp"),
@@ -134,7 +140,7 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid

 		// Stock namespace v1 services
 		createCustomColumnsOverride("stock-namespace-/v1/services", []any{
-			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "service", getColorForType("service"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/service-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
+			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "service", getColorForType("service"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-service-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
 			createStringColumn("ClusterIP", ".spec.clusterIP"),
 			createStringColumn("LoadbalancerIP", ".spec.loadBalancerIP"),
 			createTimestampColumn("Created", ".metadata.creationTimestamp"),
@@ -149,7 +155,7 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid
 		}),

 		// Factory service details port mapping
-		createCustomColumnsOverride("factory-service-details-port-mapping", []any{
+		createCustomColumnsOverride("factory-kube-service-details-port-mapping", []any{
 			createStringColumn("Name", ".name"),
 			createStringColumn("Port", ".port"),
 			createStringColumn("Protocol", ".protocol"),
@@ -169,16 +175,16 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid

 		// Factory details v1alpha1 core cozystack io tenantsecretstables
 		createCustomColumnsOverride("factory-details-v1alpha1.core.cozystack.io.tenantsecretstables", []any{
-			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "secret", getColorForType("secret"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/secret-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
+			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "secret", getColorForType("secret"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-secret-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
 			createStringColumn("Key", ".data.key"),
 			createSecretBase64Column("Value", ".data.value"),
 			createTimestampColumn("Created", ".metadata.creationTimestamp"),
 		}),

 		// Factory ingress details rules
-		createCustomColumnsOverride("factory-ingress-details-rules", []any{
+		createCustomColumnsOverride("factory-kube-ingress-details-rules", []any{
 			createStringColumn("Host", ".host"),
-			createCustomColumnWithJsonPath("Service", ".http.paths[0].backend.service.name", "S", "service", getColorForType("service"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/service-details/{reqsJsonPath[0]['.http.paths[0].backend.service.name']['-']}"),
+			createCustomColumnWithJsonPath("Service", ".http.paths[0].backend.service.name", "S", "service", getColorForType("service"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-service-details/{reqsJsonPath[0]['.http.paths[0].backend.service.name']['-']}"),
 			createStringColumn("Port", ".http.paths[0].backend.service.port.number"),
 			createStringColumn("Path", ".http.paths[0].path"),
 		}),
@@ -244,7 +250,7 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid

 		// Factory details networking k8s io v1 ingresses
 		createCustomColumnsOverride("factory-details-networking.k8s.io.v1.ingresses", []any{
-			createCustomColumnWithJsonPath("Name", ".metadata.name", "I", "ingress", getColorForType("ingress"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/ingress-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
+			createCustomColumnWithJsonPath("Name", ".metadata.name", "I", "ingress", getColorForType("ingress"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-ingress-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
 			createStringColumn("Hosts", ".spec.rules[*].host"),
 			createStringColumn("Address", ".status.loadBalancer.ingress[0].ip"),
 			createStringColumn("Port", ".spec.defaultBackend.service.port.number"),
@@ -253,7 +259,7 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid

 		// Stock namespace networking k8s io v1 ingresses
 		createCustomColumnsOverride("stock-namespace-/networking.k8s.io/v1/ingresses", []any{
-			createCustomColumnWithJsonPath("Name", ".metadata.name", "I", "ingress", getColorForType("ingress"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/ingress-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
+			createCustomColumnWithJsonPath("Name", ".metadata.name", "I", "ingress", getColorForType("ingress"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-ingress-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
 			createStringColumn("Hosts", ".spec.rules[*].host"),
 			createStringColumn("Address", ".status.loadBalancer.ingress[0].ip"),
 			createStringColumn("Port", ".spec.defaultBackend.service.port.number"),
@@ -309,7 +315,7 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid
 		// Stock cluster v1 pods
 		createCustomColumnsOverride("stock-cluster-/v1/pods", []any{
 			createCustomColumnWithJsonPath("Name", ".metadata.name", "P", "pod", "#009596", "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/pod-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
-			createCustomColumnWithJsonPath("Namespace", ".metadata.namespace", "NS", "namespace", "#a25792ff", "/openapi-ui/{2}/factory/namespace-details/{reqsJsonPath[0]['.metadata.namespace']['-']}"),
+			createCustomColumnWithJsonPath("Namespace", ".metadata.namespace", "NS", "namespace", "#a25792ff", "/openapi-ui/{2}/factory/tenantnamespace/{reqsJsonPath[0]['.metadata.namespace']['-']}"),
 			createCustomColumnWithJsonPath("Node", ".spec.nodeName", "N", "node", "#8476d1", "/openapi-ui/{2}/factory/node-details/{reqsJsonPath[0]['.spec.nodeName']['-']}"),
 			createStringColumn("Restart Policy", ".spec.restartPolicy"),
 			createStringColumn("Pod IP", ".status.podIP"),
@@ -329,15 +335,15 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid

 		// Stock cluster v1 secrets
 		createCustomColumnsOverride("stock-cluster-/v1/secrets", []any{
-			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "secret", "#c46100", "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/secret-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
-			createCustomColumnWithJsonPath("Namespace", ".metadata.namespace", "NS", "namespace", "#a25792ff", "/openapi-ui/{2}/factory/namespace-details/{reqsJsonPath[0]['.metadata.namespace']['-']}"),
+			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "secret", "#c46100", "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-secret-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
+			createCustomColumnWithJsonPath("Namespace", ".metadata.namespace", "NS", "namespace", "#a25792ff", "/openapi-ui/{2}/factory/tenantnamespace/{reqsJsonPath[0]['.metadata.namespace']['-']}"),
 			createStringColumn("Type", ".type"),
 			createTimestampColumn("Created", ".metadata.creationTimestamp"),
 		}),

 		// Stock namespace v1 secrets
 		createCustomColumnsOverride("stock-namespace-/v1/secrets", []any{
-			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "secret", "#c46100", "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/secret-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
+			createCustomColumnWithJsonPath("Name", ".metadata.name", "S", "secret", "#c46100", "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/kube-secret-details/{reqsJsonPath[0]['.metadata.name']['-']}"),
 			createStringColumn("Type", ".type"),
 			createTimestampColumn("Created", ".metadata.creationTimestamp"),
 		}),
@@ -351,6 +357,12 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid
 			createStringColumn("Memory", ".status.resources.memory"),
 			createStringColumn("Operational", ".status.operational"),
 		}),
+
+		// Stock cluster core cozystack io v1alpha1 tenantnamespaces
+		createCustomColumnsOverride("stock-cluster-/core.cozystack.io/v1alpha1/tenantnamespaces", []any{
+			createCustomColumnWithJsonPath("Name", ".metadata.name", "TN", "tenantnamespace", getColorForType("tenantnamespace"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.name']['-']}/factory/marketplace"),
+			createTimestampColumn("Created", ".metadata.creationTimestamp"),
+		}),
 	}
 }

@@ -789,7 +801,7 @@ func CreateAllFactories() []*dashboardv1alpha1.Factory {
 			},
 		},
 	}
-	secretSpec := createFactorySpec("secret-details", []any{"secret-sidebar"}, []any{"/api/clusters/{2}/k8s/api/v1/namespaces/{3}/secrets/{6}"}, secretHeader, secretTabs)
+	secretSpec := createFactorySpec("kube-secret-details", []any{"secret-sidebar"}, []any{"/api/clusters/{2}/k8s/api/v1/namespaces/{3}/secrets/{6}"}, secretHeader, secretTabs)

 	// Service details factory
 	serviceHeader := map[string]any{
@@ -1015,7 +1027,7 @@ func CreateAllFactories() []*dashboardv1alpha1.Factory {
 											"id":                   "service-port-mapping-table",
 											"baseprefix":           "/openapi-ui",
 											"clusterNamePartOfUrl": "{2}",
-											"customizationId":      "factory-service-details-port-mapping",
+											"customizationId":      "factory-kube-service-details-port-mapping",
 											"fetchUrl":             "/api/clusters/{2}/k8s/api/v1/namespaces/{3}/services/{6}",
 											"pathToItems":          ".spec.ports",
 											"withoutControls":      true,
@@ -1041,7 +1053,7 @@ func CreateAllFactories() []*dashboardv1alpha1.Factory {
 													"id":                   "service-pod-serving-table",
 													"baseprefix":           "/openapi-ui",
 													"clusterNamePartOfUrl": "{2}",
-													"customizationId":      "factory-service-details-endpointslice",
+													"customizationId":      "factory-kube-service-details-endpointslice",
 													"fetchUrl":             "/api/clusters/{2}/k8s/apis/discovery.k8s.io/v1/namespaces/{3}/endpointslices",
 													"labelsSelector": map[string]any{
 														"kubernetes.io/service-name": "{reqsJsonPath[0]['.metadata.name']['-']}",
@@ -1113,7 +1125,152 @@ func CreateAllFactories() []*dashboardv1alpha1.Factory {
 			},
 		},
 	}
-	serviceSpec := createFactorySpec("service-details", []any{"service-sidebar"}, []any{"/api/clusters/{2}/k8s/api/v1/namespaces/{3}/services/{6}"}, serviceHeader, serviceTabs)
+	serviceSpec := createFactorySpec("kube-service-details", []any{"service-sidebar"}, []any{"/api/clusters/{2}/k8s/api/v1/namespaces/{3}/services/{6}"}, serviceHeader, serviceTabs)
+
+	// Ingress details factory
+	ingressHeader := map[string]any{
+		"type": "antdFlex",
+		"data": map[string]any{
+			"id":    "header-row",
+			"align": "center",
+			"gap":   6,
+			"style": map[string]any{
+				"marginBottom": float64(24),
+			},
+		},
+		"children": []any{
+			map[string]any{
+				"type": "antdText",
+				"data": map[string]any{
+					"id":    "badge-ingress",
+					"text":  "I",
+					"title": "ingresses",
+					"style": map[string]any{
+						"backgroundColor": "#2e7dff",
+						"borderRadius":    "20px",
+						"color":           "#fff",
+						"display":         "inline-block",
+						"fontFamily":      "RedHatDisplay, Overpass, overpass, helvetica, arial, sans-serif",
+						"fontSize":        float64(20),
+						"fontWeight":      float64(400),
+						"lineHeight":      "24px",
+						"minWidth":        float64(24),
+						"padding":         "0 9px",
+						"textAlign":       "center",
+						"whiteSpace":      "nowrap",
+					},
+				},
+			},
+			map[string]any{
+				"type": "parsedText",
+				"data": map[string]any{
+					"id":   "ingress-name",
+					"text": "{reqsJsonPath[0]['.metadata.name']['-']}",
+					"style": map[string]any{
+						"fontFamily": "RedHatDisplay, Overpass, overpass, helvetica, arial, sans-serif",
+						"fontSize":   float64(20),
+						"lineHeight": "24px",
+					},
+				},
+			},
+		},
+	}
+
+	ingressTabs := []any{
+		map[string]any{
+			"key":   "details",
+			"label": "Details",
+			"children": []any{
+				contentCard("details-card", map[string]any{
+					"marginBottom": float64(24),
+				}, []any{
+					antdRow("details-grid", []any{48, 12}, []any{
+						antdCol("col-left", 12, []any{
+							antdFlexVertical("col-left-stack", 24, []any{
+								antdFlexVertical("meta-name-block", 4, []any{
+									antdText("meta-name-label", true, "Name", nil),
+									parsedText("meta-name-value", "{reqsJsonPath[0]['.metadata.name']['-']}", nil),
+								}),
+								antdFlexVertical("meta-namespace-block", 8, []any{
+									antdText("meta-namespace-label", true, "Namespace", nil),
+									map[string]any{
+										"type": "antdFlex",
+										"data": map[string]any{
+											"id":    "namespace-row",
+											"align": "center",
+											"gap":   6,
+										},
+										"children": []any{
+											createUnifiedBadgeFromKind("ns-badge", "Namespace", "namespace", BadgeSizeMedium),
+											antdLink("namespace-link",
+												"{reqsJsonPath[0]['.metadata.namespace']['-']}",
+												"/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.namespace']['-']}/factory/marketplace",
+											),
+										},
+									},
+								}),
+								antdFlexVertical("meta-created-block", 4, []any{
+									antdText("time-label", true, "Created", nil),
+									antdFlex("time-block", 6, []any{
+										antdText("time-icon", false, "🌐", nil),
+										parsedTextWithFormatter("time-value", "{reqsJsonPath[0]['.metadata.creationTimestamp']['-']}", "timestamp"),
+									}),
+								}),
+							}),
+						}),
+						antdCol("col-right", 12, []any{
+							antdFlexVertical("col-right-stack", 24, []any{
+								antdFlexVertical("status-ingress-ip", 4, []any{
+									antdText("status-ingress-ip-label", true, "LoadBalancer IP", nil),
+									parsedText("status-ingress-ip-value", "{reqsJsonPath[0]['.status.loadBalancer.ingress[0].ip']['-']}", nil),
+								}),
+								antdFlexVertical("status-ingress-hostname", 4, []any{
+									antdText("status-ingress-hostname-label", true, "LoadBalancer Hostname", nil),
+									parsedText("status-ingress-hostname-value", "{reqsJsonPath[0]['.status.loadBalancer.ingress[0].hostname']['-']}", nil),
+								}),
+							}),
+						}),
+					}),
+					spacer("rules-title-spacer", float64(16)),
+					antdText("rules-title", true, "Rules", map[string]any{
+						"fontSize": float64(20),
+					}),
+					spacer("rules-spacer", float64(8)),
+					map[string]any{
+						"type": "EnrichedTable",
+						"data": map[string]any{
+							"id":                   "rules-table",
+							"fetchUrl":             "/api/clusters/{2}/k8s/apis/networking.k8s.io/v1/namespaces/{3}/ingresses/{6}",
+							"clusterNamePartOfUrl": "{2}",
+							"customizationId":      "factory-kube-ingress-details-rules",
+							"baseprefix":           "/openapi-ui",
+							"withoutControls":      true,
+							"pathToItems":          []any{"spec", "rules"},
+						},
+					},
+				}),
+			},
+		},
+		map[string]any{
+			"key":   "yaml",
+			"label": "YAML",
+			"children": []any{
+				map[string]any{
+					"type": "YamlEditorSingleton",
+					"data": map[string]any{
+						"id":                        "yaml-editor",
+						"cluster":                   "{2}",
+						"isNameSpaced":              true,
+						"type":                      "builtin",
+						"typeName":                  "ingresses",
+						"prefillValuesRequestIndex": float64(0),
+						"substractHeight":           float64(400),
+					},
+				},
+			},
+		},
+	}
+	ingressSpec := createFactorySpec("kube-ingress-details", []any{"ingress-sidebar"}, []any{"/api/clusters/{2}/k8s/apis/networking.k8s.io/v1/namespaces/{3}/ingresses/{6}"}, ingressHeader, ingressTabs)

 	// Workloadmonitor details factory
 	workloadmonitorHeader := createWorkloadmonitorHeader()
@@ -1273,8 +1430,9 @@ func CreateAllFactories() []*dashboardv1alpha1.Factory {
 		createFactory("namespace-details", namespaceSpec),
 		createFactory("node-details", nodeSpec),
 		createFactory("pod-details", podSpec),
-		createFactory("secret-details", secretSpec),
-		createFactory("service-details", serviceSpec),
+		createFactory("kube-secret-details", secretSpec),
+		createFactory("kube-service-details", serviceSpec),
+		createFactory("kube-ingress-details", ingressSpec),
 		createFactory("workloadmonitor-details", workloadmonitorSpec),
 	}
 }
@@ -1293,36 +1451,8 @@ func CreateAllNavigations() []*dashboardv1alpha1.Navigation {

 // CreateAllTableUriMappings creates all table URI mapping resources using helper functions
 func CreateAllTableUriMappings() []*dashboardv1alpha1.TableUriMapping {
-	return []*dashboardv1alpha1.TableUriMapping{
-		// Stock namespace default apps cozystack io v1alpha1 virtualmachines yaml
-		createTableUriMapping("virtualmachine-details", map[string]any{
-			"tableUri":    "/openapi-ui/{clusterName}/{namespace}/builtin-table/virtualmachines",
-			"resourceUri": "/openapi-ui/{clusterName}/{namespace}/builtin-table/virtualmachines",
-		}),
-
-		// Namespaces
-		createTableUriMapping("namespaces", map[string]any{
-			"id":             "stock-cluster-/core.cozystack.io/v1alpha1/tenantnamespaces",
-			"keysToParse":    []any{"metadata", "name"},
-			"pathToNavigate": "/openapi-ui/{clusterName}/~recordValue~/factory/marketplace",
-		}),
-
-		// Stock cluster networking k8s io v1 ingress details
-		createTableUriMapping("stock-cluster-networking.k8s.io.v1.ingress-details", map[string]any{
-			"keysToParse":       ".metadata.name",
-			"keysToParseSecond": ".metadata.namespace",
-			"id":                "stock-cluster-/networking.k8s.io/v1/ingresses",
-			"pathToNavigate":    "/openapi-ui/{clusterName}/~recordValueSecond~/factory/ingress-details/~recordValue~",
-		}),
-
-		// Stock namespace networking k8s io v1 ingress details
-		createTableUriMapping("stock-namespace-networking.k8s.io.v1.ingress-details", map[string]any{
-			"keysToParse":       ".metadata.name",
-			"keysToParseSecond": ".metadata.namespace",
-			"id":                "stock-namespace-/networking.k8s.io/v1/ingresses",
-			"pathToNavigate":    "/openapi-ui/{clusterName}/~recordValueSecond~/factory/ingress-details/~recordValue~",
-		}),
-	}
+	// links are now handled through CustomFormsPrefills
+	return []*dashboardv1alpha1.TableUriMapping{}
 }

 // ---------------- Additional helper functions for missing resource types ----------------
--- a/packages/system/cozystack-api/templates/cozystack-resource-definitions/etcd.yaml
+++ b/packages/system/cozystack-api/templates/cozystack-resource-definitions/etcd.yaml
@@ -26,6 +26,7 @@ spec:
    plural: Etcd
    name: etcd
    description: Storage for Kubernetes clusters
+    module: true
    icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9Ii0wLjAwMTk1MzEyIiB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgcng9IjI0IiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfNjgzXzI5NjMpIi8+CjxwYXRoIGQ9Ik0xMjIuNDQyIDczLjQ3MjlDMTIxLjk1OSA3My41MTM0IDEyMS40NzQgNzMuNTMyMiAxMjAuOTU4IDczLjUzMjJDMTE3Ljk2NSA3My41MzIyIDExNS4wNjEgNzIuODMwNCAxMTIuNDQyIDcxLjU0NTFDMTEzLjMxNCA2Ni41NDIxIDExMy42ODUgNjEuNTAxOSAxMTMuNTg4IDU2LjQ4MDJDMTEwLjc0OCA1Mi4zNzIzIDEwNy41MDIgNDguNDk2NSAxMDMuODM4IDQ0LjkyNTdDMTA1LjQyOCA0MS45NDU0IDEwNy43NzggMzkuMzgxMSAxMTAuNzExIDM3LjU2MjhMMTExLjk3MSAzNi43ODQyTDExMC45ODkgMzUuNjc3NEMxMDUuOTMyIDI5Ljk4MzIgOTkuODk3MSAyNS41ODA5IDkzLjA1NDcgMjIuNTkzN0w5MS42OTAyIDIyTDkxLjM0MzcgMjMuNDQyM0M5MC41Mjc3IDI2LjgwMzYgODguODIyMiAyOS44MzYgODYuNDgwNyAzMi4yNjk1QzgxLjk4MDMgMjkuODc3NCA3Ny4yNzg4IDI3Ljk0NCA3Mi40MzA1IDI2LjQ3OTdDNjcuNTkzNyAyNy45NDA4IDYyLjkwMDUgMjkuODY4NiA1OC40MDIgMzIuMjU3MUM1Ni4wNzAxIDI5LjgyNjggNTQuMzY4OCAyNi44MDE4IDUzLjU1NiAyMy40NTAxTDUzLjIwNzIgMjIuMDA4M0w1MS44NDc3IDIyLjU5OTJDNDUuMDkxNCAyNS41NDMxIDM4Ljg5MDEgMzAuMDY0NyAzMy45MTYyIDM1LjY3NDJMMzIuOTMxOCAzNi43ODMzTDM0LjE5IDM3LjU2MTlDMzcuMTE0MiAzOS4zNzMzIDM5LjQ1NzYgNDEuOTIyNCA0MS4wNDQ0IDQ0Ljg4NjZDMzcuMzkxNyA0OC40NDM1IDM0LjE0OTUgNTIuMzA3IDMxLjMxMTkgNTYuMzk1OUMzMS4yMDE0IDYxLjQxNTQgMzEuNTUzNSA2Ni40OTI0IDMyLjQyOTcgNzEuNTY0NEMyOS44MjMxIDcyLjgzNzggMjYuOTM1OCA3My41MzE4IDIzLjk2MjggNzMuNTMxOEMyMy40NDA5IDczLjUzMTggMjIuOTUyNyA3My41MTI5IDIyLjQ3ODIgNzMuNDczM0wyMSA3My4zNjA2TDIxLjEzODUgNzQuODM2NUMyMS44NjI5IDgyLjMwMzMgMjQuMTgxNCA4OS40MDUzIDI4LjAzMzQgOTUuOTQ3MUwyOC43ODUzIDk3LjIyMzdMMjkuOTE0MiA5Ni4yNjU2QzMyLjUzMDUgOTQuMDQ2NSAzNS42OTE3IDkyLjU3NyAzOS4wNTMgOTEuOTg0N0M0MS4yNjg5IDk2LjUxNTUgNDMuODk1MyAxMDAuNzcyIDQ2Ljg3NDcgMTA0LjcyNUM1MS42Mjg3IDEwNi4zODcgNTYuNTgxOSAxMDcuNjI5IDYxLjY5NzEgMTA4LjM2N0M2Mi4xODc3IDExMS43NSA2MS43OTcgMTE1LjI0OSA2MC40NjI0IDExOC40ODRMNTkuODk5NSAxMTkuODU1TDYxLjM0NjkgMTIwLjE3NEM2NS4wNTI5IDEyMC45ODkgNjguNzkxNyAxMjEuNDA0IDcyLjQ1MjYgMTIxLjQwNEw4My41NTUxIDEyMC4xNzRMODUuMDAzOSAxMTkuODU1TDg0LjQzOTcgMTE4LjQ4MkM4My4xMDg3IDExNS4yNDYgODIuNzE4IDExMS43NDMgODMuMjA4NiAxMDguMzZDODguMzAzNiAxMDcuNjIxIDkzLjIzODQgMTA2LjM4MiA5Ny45NzQ4IDEwNC43MjVDMTAwLjk1NyAxMDAuNzY5IDEwMy41ODYgOTYuNTA5NSAxMDUuODA1IDkxLjk3MjhDMTA5LjE3NyA5Mi41NjE0IDExMi4zNTYgOTQuMDMxNyAxMTQuOTg5IDk2LjI1NzNMMTE2LjExOCA5Ny4yMTQxTDExNi44NjYgOTUuOTQwN0MxMjAuNzI1IDg5LjM5MDUgMTIzLjA0MyA4Mi4yODkxIDEyMy43NTYgNzQuODM0MkwxMjMuODk1IDczLjM2MUwxMjIuNDQyIDczLjQ3MjlaTTg4LjMxOTcgOTEuNTE4MUM4My4wNjczIDkyLjk0NjYgNzcuNzMzIDkzLjY2NzcgNzIuNDMwNSA5My42Njc3QzY3LjExMzcgOTMuNjY3NyA2MS43ODU5IDkyLjk0NyA1Ni41MjkgOTEuNTE4MUM1My42NDQ4IDg3LjAzNjYgNTEuMzY0NSA4Mi4yMzU3IDQ5LjcyMzQgNzcuMTgxMkM0OC4wODkyIDcyLjE1MDIgNDcuMTMyOSA2Ni44Nzk1IDQ2Ljg1NTQgNjEuNDUyMkM1MC4yNTA0IDU3LjI1NDcgNTQuMTExIDUzLjU3NzYgNTguMzc2NyA1MC40ODIzQzYyLjcxMTQgNDcuMzI5NCA2Ny40MjcxIDQ0Ljc2NzkgNzIuNDMwNSA0Mi44NDFDNzcuNDI1NiA0NC43NjgzIDgyLjEzMjYgNDcuMzI2MiA4Ni40NTcyIDUwLjQ2NTdDOTAuNzM5NCA1My41Nzc2IDk0LjYxNzEgNTcuMjgzMiA5OC4wMjg3IDYxLjUwN0M5Ny43Mzc4IDY2LjkwMzQgOTYuNzcgNzIuMTQzOCA5NS4xMzMgNzcuMTY2NUM5My40OTYxIDgyLjIyIDkxLjIwODQgODcuMDM2MSA4OC4zMTk3IDkxLjUxODFaTTc2Ljc2ODQgNjYuMTk3NEM3Ni43Njg0IDY5LjkwODEgNzkuNzc1NCA3Mi45MDk2IDgzLjQ4MSA3Mi45MDk2Qzg3LjE4NTcgNzIuOTA5NiA5MC4xODk1IDY5LjkwODYgOTAuMTg5NSA2Ni4xOTc0QzkwLjE4OTUgNjIuNTAxIDg3LjE4NTcgNTkuNDg4MSA4My40ODEgNTkuNDg4MUM3OS43NzU0IDU5LjQ4ODEgNzYuNzY4NCA2Mi41MDEgNzYuNzY4NCA2Ni4xOTc0Wk02OC4wOTU0IDY2LjE5NzRDNjguMDk1NCA2OS45MDgxIDY1LjA4ODggNzIuOTA5NiA2MS4zODMyIDcyLjkwOTZDNTcuNjc0OSA3Mi45MDk2IDU0LjY3NjYgNjkuOTA4NiA1NC42NzY2IDY2LjE5NzRDNTQuNjc2NiA2Mi41MDI0IDU3LjY3NTMgNTkuNDg5NCA2MS4zODMyIDU5LjQ4OTRDNjUuMDg4OCA1OS40ODk0IDY4LjA5NTQgNjIuNTAyNCA2OC4wOTU0IDY2LjE5NzRaIiBmaWxsPSJ3aGl0ZSIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4M18yOTYzIiB4MT0iNS41IiB5MT0iMTEiIHgyPSIxNDEiIHkyPSIxMjQuNSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjNTNCMkYwIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzQxOUVEQSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=
    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "size"], ["spec", "storageClass"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resources", "cpu"], ["spec", "resources", "memory"]]
  secrets:
--- a/packages/system/cozystack-api/templates/cozystack-resource-definitions/info.yaml
+++ b/packages/system/cozystack-api/templates/cozystack-resource-definitions/info.yaml
@@ -26,6 +26,7 @@ spec:
    singular: Info
    plural: Info
    description: Info
+    module: true
    icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX3JhZGlhbF8xNDRfMykiLz4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzE0NF8zKSI+CjxwYXRoIGQ9Ik03Ny42NDA3IDk3LjA4NDRMODIuODMzIDk3LjM2MDRWMTA0LjYzN0g2MS4xNzI4Vjk3LjcxOTdMNjQuMTc3MSA5Ny40NDk1QzY1LjgxMDEgOTcuMjY4NCA2Ni44MTA2IDk2LjcxOTMgNjYuODEwNiA5NC41MzQzVjY5LjIzMTRDNjYuODEwNiA2Ny4yMjE3IDY2LjI3MDEgNjYuNTg2NCA2NC41MzY1IDY2LjU4NjRMNjEuMzU2OCA2Ni40MDgxVjU4Ljg1ODRINzcuNjQ2NUw3Ny42NDA3IDk3LjA4NDRaTTcxLjI3MjYgMzkuMzYzQzc1LjI4MDQgMzkuMzYzIDc4LjE4NyA0Mi4zNzMxIDc4LjE4NyA0Ni4xODgzQzc4LjE4NyA1MC4wMTQ5IDc1LjI3MTggNTIuODM4MSA3MS4xNzc4IDUyLjgzODFDNjYuOTk3NSA1Mi44MzgxIDY0LjI2NjMgNTAuMDE0OSA2NC4yNjYzIDQ2LjE4ODNDNjQuMjY2MyA0Mi4zNzMxIDY2Ljk5NzUgMzkuMzYzIDcxLjI3MjYgMzkuMzYzWk03MiAxMThDNDYuNjM2OCAxMTggMjYgOTcuMzYzMiAyNiA3MkMyNiA0Ni42MzY4IDQ2LjYzNjggMjYgNzIgMjZDOTcuMzU3NSAyNiAxMTggNDYuNjM2OCAxMTggNzJDMTE4IDk3LjM2MzIgOTcuMzU3NSAxMTggNzIgMTE4Wk03MiAzNC42MjVDNTEuMzkyIDM0LjYyNSAzNC42MjUgNTEuMzkyIDM0LjYyNSA3MkMzNC42MjUgOTIuNjA4IDUxLjM5MiAxMDkuMzc1IDcyIDEwOS4zNzVDOTIuNjA4IDEwOS4zNzUgMTA5LjM3NSA5Mi42MDggMTA5LjM3NSA3MkMxMDkuMzc1IDUxLjM5MiA5Mi42MDggMzQuNjI1IDcyIDM0LjYyNVoiIGZpbGw9IndoaXRlIi8+CjwvZz4KPGRlZnM+CjxyYWRpYWxHcmFkaWVudCBpZD0icGFpbnQwX3JhZGlhbF8xNDRfMyIgY3g9IjAiIGN5PSIwIiByPSIxIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgZ3JhZGllbnRUcmFuc2Zvcm09InRyYW5zbGF0ZSgxLjMyMjk4ZS0wNSAtNy41MDAwMSkgcm90YXRlKDQ0LjcxNzgpIHNjYWxlKDIxNS4zMTcgMzEyLjQ1NSkiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDBCNUU3Ii8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzAwMzk4NCIvPgo8L3JhZGlhbEdyYWRpZW50Pgo8Y2xpcFBhdGggaWQ9ImNsaXAwXzE0NF8zIj4KPHJlY3Qgd2lkdGg9IjkyIiBoZWlnaHQ9IjkyIiBmaWxsPSJ3aGl0ZSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMjYgMjYpIi8+CjwvY2xpcFBhdGg+CjwvZGVmcz4KPC9zdmc+Cg==
    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"]]
  secrets:
--- a/packages/system/cozystack-api/templates/cozystack-resource-definitions/ingress.yaml
+++ b/packages/system/cozystack-api/templates/cozystack-resource-definitions/ingress.yaml
@@ -26,6 +26,7 @@ spec:
    plural: Ingress
    name: ingress
    description: NGINX Ingress Controller
+    module: true
    icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODRfMzIyOSkiLz4KPHBhdGggZD0iTTg2LjkyNzQgMzcuMTA3NEgxN1YxMDcuMDM1SDg2LjkyNzRWMzcuMTA3NFoiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iNiIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZD0iTTEyNy42NDMgMjlIMTA3LjQ1NVY0OS4xODgzSDEyNy42NDNWMjlaIiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjQiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik0xMjcuNjQzIDYxLjcyNjZIMTA3LjQ1NVY4MS45MTQ5SDEyNy42NDNWNjEuNzI2NloiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iNCIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZD0iTTEyNy42NDMgOTQuNDUyMUgxMDcuNDU1VjExNC42NEgxMjcuNjQzVjk0LjQ1MjFaIiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjQiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik04OC41MTM3IDcyLjA3MTNIMTA2LjI3IiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjMiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik04Ny41Njc0IDgwLjQyNDhMMTA3LjczIDk1Ljc4MDUiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMyIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZD0iTTg3LjU2NzQgNjMuNzE4MUwxMDcuNzMgNDguMzYyMyIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIzIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4NF8zMjI5IiB4MT0iMTAiIHkxPSIxNS41IiB4Mj0iMTQ0IiB5Mj0iMTMxLjUiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agc3RvcC1jb2xvcj0iIzAwREE1MyIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMwMDk2MzkiLz4KPC9saW5lYXJHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K
    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "whitelist"], ["spec", "cloudflareProxy"], ["spec", "resources"], ["spec", "resourcesPreset"]]
  secrets:
--- a/packages/system/cozystack-api/templates/cozystack-resource-definitions/monitoring.yaml
+++ b/packages/system/cozystack-api/templates/cozystack-resource-definitions/monitoring.yaml
--- a/packages/system/cozystack-api/templates/cozystack-resource-definitions/seaweedfs.yaml
+++ b/packages/system/cozystack-api/templates/cozystack-resource-definitions/seaweedfs.yaml
--- a/packages/system/cozystack-controller/templates/crds/cozystack.io_cozystackresourcedefinitions.yaml
+++ b/packages/system/cozystack-controller/templates/crds/cozystack.io_cozystackresourcedefinitions.yaml
@@ -84,6 +84,9 @@ spec:
                        type: string
                      type: array
                    type: array
+                  module:
+                    description: Whether this resource is a module (tenant module)
+                    type: boolean
                  name:
                    description: Hard-coded name used in the UI (e.g., "bucket")
                    type: string