chore: refactor carvel to use proxied k8s api endpoints (#360)

Author: laszlocph

cli/pkg/server/carvel_diagram.go

@@ -19,14 +19,12 @@ import (
 	"github.com/gimlet-io/capacitor/pkg/kubernetes"
 	"github.com/labstack/echo/v4"
 	"k8s.io/client-go/discovery"
-	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/rest"
 )
 
 // KubernetesProxy handles proxying requests to the Kubernetes API
 type KubernetesProxy struct {
 	k8sClient        *kubernetes.Client
-	dynamicClient    dynamic.Interface // Dynamic client for Carvel and other custom resources
 	proxy            *httputil.ReverseProxy
 	fluxAPIPaths     map[string]string // Cache for discovered Flux API paths (kind -> API path template)
 	fluxAPIPathsMu   sync.RWMutex      // Mutex for thread-safe access to fluxAPIPaths
@@ -131,17 +129,10 @@ func NewKubernetesProxy(k8sClient *kubernetes.Client) (*KubernetesProxy, error)
 		io.WriteString(w, fmt.Sprintf("Error proxying request to Kubernetes API: %v", err))
 	}
 
-	// Create dynamic client for Carvel and other custom resources
-	dynamicClient, err := dynamic.NewForConfig(k8sClient.Config)
-	if err != nil {
-		return nil, fmt.Errorf("error creating dynamic client: %w", err)
-	}
-
 	return &KubernetesProxy{
-		k8sClient:     k8sClient,
-		dynamicClient: dynamicClient,
-		proxy:         proxy,
-		fluxAPIPaths:  make(map[string]string),
+		k8sClient:    k8sClient,
+		proxy:        proxy,
+		fluxAPIPaths: make(map[string]string),
 	}, nil
 }
 

cli/pkg/server/carvel_operations.go

@@ -1324,166 +1324,6 @@ func (s *Server) Setup() {
 		})
 	})
 
-	// Add endpoint for fetching resources from remote clusters (for Carvel apps/pkgis)
-	s.echo.GET("/api/:context/carvel-remote-resource", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-
-		// Get resource details from query params
-		namespace := c.QueryParam("namespace")
-		kind := c.QueryParam("kind")
-		name := c.QueryParam("name")
-		apiVersion := c.QueryParam("apiVersion")
-		parentKind := c.QueryParam("parentKind")
-		parentName := c.QueryParam("parentName")
-		parentNamespace := c.QueryParam("parentNamespace")
-
-		if kind == "" || name == "" || parentKind == "" || parentName == "" || parentNamespace == "" {
-			return c.JSON(http.StatusBadRequest, map[string]string{
-				"error": "kind, name, parentKind, parentName, and parentNamespace are required",
-			})
-		}
-
-		log.Printf("[RemoteResource] Fetching %s/%s from namespace %s via parent %s/%s in namespace %s",
-			kind, name, namespace, parentKind, parentName, parentNamespace)
-
-		// Fetch the parent resource (App or PackageInstall) to get cluster config
-		ctx := c.Request().Context()
-		var parentGVR schema.GroupVersionResource
-		if parentKind == "App" {
-			parentGVR = schema.GroupVersionResource{Group: "kappctrl.k14s.io", Version: "v1alpha1", Resource: "apps"}
-		} else if parentKind == "PackageInstall" {
-			parentGVR = schema.GroupVersionResource{Group: "packaging.carvel.dev", Version: "v1alpha1", Resource: "packageinstalls"}
-		} else {
-			return c.JSON(http.StatusBadRequest, map[string]string{
-				"error": fmt.Sprintf("unsupported parent kind: %s", parentKind),
-			})
-		}
-
-		parentResource, err := proxy.dynamicClient.Resource(parentGVR).Namespace(parentNamespace).Get(ctx, parentName, metav1.GetOptions{})
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{
-				"error": fmt.Sprintf("failed to get parent resource: %v", err),
-			})
-		}
-
-		// Create clients for the remote cluster
-		remoteClients, clusterName, err := createClientsForCluster(ctx, parentResource.Object, parentNamespace, proxy.k8sClient.Clientset)
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, map[string]string{
-				"error": fmt.Sprintf("failed to create remote cluster clients: %v", err),
-			})
-		}
-		if remoteClients == nil {
-			return c.JSON(http.StatusBadRequest, map[string]string{
-				"error": "parent resource does not have spec.cluster.kubeconfigSecretRef configured",
-			})
-		}
-
-		log.Printf("[RemoteResource] Using remote cluster: %s", clusterName)
-
-		// Determine the GVR for the resource
-		group := ""
-		version := "v1"
-		if apiVersion != "" {
-			parts := strings.Split(apiVersion, "/")
-			if len(parts) == 2 {
-				group = parts[0]
-				version = parts[1]
-			} else {
-				version = apiVersion
-			}
-		}
-
-		// Get resource plural name and scope from API resources discovery
-		discoveryClient := remoteClients.Clientset.Discovery()
-		resourceLists, err := discoveryClient.ServerPreferredResources()
-		if err != nil {
-			log.Printf("[RemoteResource] Warning: failed to get preferred resources: %v", err)
-		}
-
-		resourceName := strings.ToLower(kind) + "s" // default plural
-		isNamespaced := true                        // default to namespaced
-		if resourceLists != nil {
-			for _, resourceList := range resourceLists {
-				gv := strings.Split(resourceList.GroupVersion, "/")
-				listGroup := ""
-				listVersion := ""
-				if len(gv) == 2 {
-					listGroup = gv[0]
-					listVersion = gv[1]
-				} else {
-					listVersion = gv[0]
-				}
-
-				if (group == "" && listGroup == "") || group == listGroup {
-					if version == listVersion {
-						for _, resource := range resourceList.APIResources {
-							if strings.EqualFold(resource.Kind, kind) {
-								resourceName = resource.Name
-								isNamespaced = resource.Namespaced
-								log.Printf("[RemoteResource] Found resource: %s (namespaced: %v)", resourceName, isNamespaced)
-								break
-							}
-						}
-					}
-				}
-			}
-		}
-
-		targetGVR := schema.GroupVersionResource{
-			Group:    group,
-			Version:  version,
-			Resource: resourceName,
-		}
-
-		// Check if managedFields should be included
-		includeManagedFields := c.QueryParam("includeManagedFields") == "true"
-
-		log.Printf("[RemoteResource] Fetching resource with GVR: %s/%s/%s (namespaced: %v, namespace: %s, includeManagedFields: %v)",
-			targetGVR.Group, targetGVR.Version, targetGVR.Resource, isNamespaced, namespace, includeManagedFields)
-
-		// Fetch the resource from remote cluster
-		var resource map[string]interface{}
-		var fetchErr error
-		if isNamespaced {
-			// For namespaced resources, use the namespace (or default to "default" if empty)
-			ns := namespace
-			if ns == "" {
-				ns = "default"
-			}
-			unstructured, err := remoteClients.DynamicClient.Resource(targetGVR).Namespace(ns).Get(ctx, name, metav1.GetOptions{})
-			if err == nil {
-				resource = unstructured.Object
-			}
-			fetchErr = err
-		} else {
-			// For cluster-scoped resources, don't use namespace
-			unstructured, err := remoteClients.DynamicClient.Resource(targetGVR).Get(ctx, name, metav1.GetOptions{})
-			if err == nil {
-				resource = unstructured.Object
-			}
-			fetchErr = err
-		}
-
-		if fetchErr != nil {
-			return c.JSON(http.StatusNotFound, map[string]string{
-				"error": fmt.Sprintf("failed to fetch resource from remote cluster: %v", fetchErr),
-			})
-		}
-
-		// Remove managedFields if not requested
-		if !includeManagedFields {
-			if metadata, ok := resource["metadata"].(map[string]interface{}); ok {
-				delete(metadata, "managedFields")
-			}
-		}
-
-		return c.JSON(http.StatusOK, resource)
-	})
-
 	// Add endpoint for describing Kubernetes resources using kubectl describe (context-aware)
 	s.echo.GET("/api/:context/describe/:namespace/:kind/:name", func(c echo.Context) error {
 		proxy, ok := getProxyFromContext(c)
@@ -1706,133 +1546,6 @@ func (s *Server) Setup() {
 		})
 	})
 
-	// Add endpoint for Carvel App diagram (context-aware)
-	s.echo.GET("/api/:context/carvelAppDiagram/:namespace/:name", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelAppDiagram(c, proxy)
-	})
-
-	// Add endpoint for Carvel PackageInstall diagram (context-aware)
-	s.echo.GET("/api/:context/carvelPkgiDiagram/:namespace/:name", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPkgiDiagram(c, proxy)
-	})
-
-	// Add endpoint for Carvel App values and overlays (context-aware)
-	s.echo.GET("/api/:context/carvelAppValues/:namespace/:name", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelAppValues(c, proxy)
-	})
-
-	// Add endpoint for Carvel PackageInstall values and overlays (context-aware)
-	s.echo.GET("/api/:context/carvelPackageInstallValues/:namespace/:name", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPackageInstallValues(c, proxy)
-	})
-
-	// Add endpoint for Carvel Package details (context-aware)
-	s.echo.GET("/api/:context/carvelPackage/:namespace/:packageName", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPackage(c, proxy)
-	})
-
-	// Add endpoints for Carvel App operations (context-aware)
-	s.echo.POST("/api/:context/carvelApp/:namespace/:name/pause", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelAppPause(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelApp/:namespace/:name/unpause", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelAppUnpause(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelApp/:namespace/:name/cancel", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelAppCancel(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelApp/:namespace/:name/uncancel", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelAppUncancel(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelApp/:namespace/:name/trigger", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelAppTrigger(c, proxy)
-	})
-
-	// Add endpoints for Carvel PackageInstall operations (context-aware)
-	s.echo.POST("/api/:context/carvelPackageInstall/:namespace/:name/pause", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPackageInstallPause(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelPackageInstall/:namespace/:name/unpause", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPackageInstallUnpause(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelPackageInstall/:namespace/:name/cancel", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPackageInstallCancel(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelPackageInstall/:namespace/:name/uncancel", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPackageInstallUncancel(c, proxy)
-	})
-
-	s.echo.POST("/api/:context/carvelPackageInstall/:namespace/:name/trigger", func(c echo.Context) error {
-		proxy, ok := getProxyFromContext(c)
-		if !ok {
-			return c.JSON(http.StatusBadRequest, map[string]string{"error": "missing proxy in context"})
-		}
-		return handleCarvelPackageInstallTrigger(c, proxy)
-	})
-
 	// Kubernetes API proxy endpoints
 	// New: match routes with explicit context: /k8s/:context/*
 	s.echo.Any("/k8s/:context/*", func(c echo.Context) error {