Merge pull request #395 from tnthornton/up-ctp-connector-install

MCP Connector support for Spaces

cmd/up/controlplane/connector/connector.go

@@ -27,5 +27,6 @@ func (c *Cmd) BeforeReset(p *kong.Path, maturity feature.Maturity) error {
 
 // Cmd contains commands for installing mcp-connector into an App Cluster.
 type Cmd struct {
-	Install installCmd `cmd:"" help:"Install mcp-connector into an App Cluster."`
+	Install   installCmd   `cmd:"" help:"Install mcp-connector into an App Cluster."`
+	Uninstall uninstallCmd `cmd:"" help:"Uninstall mcp-connector from an App Cluster."`
 }

cmd/up/controlplane/connector/install.go

@@ -108,31 +108,50 @@ type installCmd struct {
 	ClusterName           string `help:"Name of the cluster connecting to the control plane. If not provided, the namespace argument value will be used."`
 	Kubeconfig            string `type:"existingfile" help:"Override the default kubeconfig path."`
 	InstallationNamespace string `short:"n" env:"MCP_CONNECTOR_NAMESPACE" default:"kube-system" help:"Kubernetes namespace for MCP Connector. Default is kube-system."`
+	ControlPlaneSecret    string `help:"Name of the secret that contains the kubeconfig for a control plane."`
 
 	install.CommonParams
 }
 
 // Run executes the connect command.
 func (c *installCmd) Run(p pterm.TextPrinter, upCtx *upbound.Context) error {
-	if upCtx.Profile.IsSpace() {
-		return fmt.Errorf("connect is not supported for space profile %q", upCtx.ProfileName)
-	}
+	token := "not defined"
+	var err error
 
-	token, err := c.getToken(p, upCtx)
-	if err != nil {
-		return errors.Wrap(err, "failed to get token")
+	if !upCtx.Profile.IsSpace() {
+		token, err = c.getToken(p, upCtx)
+		if err != nil {
+			return errors.Wrap(err, "failed to get token")
+		}
 	}
 	params, err := c.parser.Parse()
 	if err != nil {
 		return errors.Wrap(err, errParseInstallParameters)
 	}
-	params["mcp"] = map[string]string{
+	// Some of these settings are only applicable if pointing to an Upbound
+	// Cloud control plane. We leave them consistent since they won't impact
+	// our ability to point the connector at Space control plane.
+	params["mcp"] = map[string]any{
 		"account":   upCtx.Account,
 		"name":      c.Name,
 		"namespace": c.Namespace,
 		"host":      fmt.Sprintf("%s://%s", upCtx.ProxyEndpoint.Scheme, upCtx.ProxyEndpoint.Host),
 		"token":     token,
 	}
+
+	// If the control-plane-secret has been specified, disable provisioning
+	// the mcp-kubeconfig secret in favor of the supplied secret name.
+	if c.ControlPlaneSecret != "" {
+		v := params["mcp"]
+		param := v.(map[string]any)
+		param["secret"] = map[string]any{
+			"name":      c.ControlPlaneSecret,
+			"provision": false,
+		}
+
+		params["mcp"] = param
+	}
+
 	p.Printfln("Installing %s to kube-system. This may take a few minutes.", connectorName)
 	if err = c.mgr.Install("", params); err != nil {
 		return err

cmd/up/controlplane/connector/uninstall.go

@@ -0,0 +1,70 @@
+// Copyright 2023 Upbound Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package connector
+
+import (
+	"github.com/alecthomas/kong"
+	"github.com/pterm/pterm"
+
+	"github.com/upbound/up/internal/install"
+	"github.com/upbound/up/internal/install/helm"
+	"github.com/upbound/up/internal/kube"
+	"github.com/upbound/up/internal/upbound"
+)
+
+// AfterApply sets default values in command after assignment and validation.
+func (c *uninstallCmd) AfterApply(kongCtx *kong.Context, upCtx *upbound.Context) error {
+	if c.ClusterName == "" {
+		c.ClusterName = c.Namespace
+	}
+	kubeconfig, err := kube.GetKubeConfig(c.Kubeconfig)
+	if err != nil {
+		return err
+	}
+	if upCtx.WrapTransport != nil {
+		kubeconfig.Wrap(upCtx.WrapTransport)
+	}
+
+	mgr, err := helm.NewManager(kubeconfig,
+		connectorName,
+		mcpRepoURL,
+		helm.WithNamespace(c.InstallationNamespace),
+		helm.Wait(),
+	)
+	if err != nil {
+		return err
+	}
+	c.mgr = mgr
+	return nil
+}
+
+// uninstallCmd uninstalls UXP.
+type uninstallCmd struct {
+	mgr install.Manager
+
+	ClusterName           string `help:"Name of the cluster connecting to the control plane. If not provided, the namespace argument value will be used."`
+	Namespace             string `arg:"" required:"" help:"Namespace in the control plane where the claims of the cluster will be stored."`
+	Kubeconfig            string `type:"existingfile" help:"Override the default kubeconfig path."`
+	InstallationNamespace string `short:"n" env:"MCP_CONNECTOR_NAMESPACE" default:"kube-system" help:"Kubernetes namespace for MCP Connector. Default is kube-system."`
+}
+
+// Run executes the uninstall command.
+func (c *uninstallCmd) Run(p pterm.TextPrinter) error {
+	if err := c.mgr.Uninstall(); err != nil {
+		return err
+	}
+	p.Printfln("MCP Connector uninstalled")
+	return nil
+}