Remove deprecated commands and flags (#1132)

Author: eleftherias

cmd/thv-operator/controllers/mcpserver_controller.go

@@ -387,7 +387,7 @@ func (r *MCPServerReconciler) deploymentForMCPServer(m *mcpv1alpha1.MCPServer) *
 
 	// Prepare container args
 	args := []string{"run", "--foreground=true"}
-	args = append(args, fmt.Sprintf("--port=%d", m.Spec.Port))
+	args = append(args, fmt.Sprintf("--proxy-port=%d", m.Spec.Port))
 	args = append(args, fmt.Sprintf("--name=%s", m.Name))
 	args = append(args, fmt.Sprintf("--transport=%s", m.Spec.Transport))
 	args = append(args, fmt.Sprintf("--host=%s", getProxyHost()))
@@ -780,7 +780,7 @@ func deploymentNeedsUpdate(deployment *appsv1.Deployment, mcpServer *mcpv1alpha1
 		}
 
 		// Check if the port has changed
-		portArg := fmt.Sprintf("--port=%d", mcpServer.Spec.Port)
+		portArg := fmt.Sprintf("--proxy-port=%d", mcpServer.Spec.Port)
 		found = false
 		for _, arg := range container.Args {
 			if arg == portArg {

cmd/thv-proxyrunner/app/run.go

@@ -46,7 +46,7 @@ var (
 	runTransport          string
 	runName               string
 	runHost               string
-	runPort               int
+	runProxyPort          int
 	runTargetPort         int
 	runPermissionProfile  string
 	runEnv                []string
@@ -79,11 +79,8 @@ var (
 func init() {
 	runCmd.Flags().StringVar(&runTransport, "transport", "", "Transport mode (sse, streamable-http or stdio)")
 	runCmd.Flags().StringVar(&runName, "name", "", "Name of the MCP server (auto-generated from image if not provided)")
-	runCmd.Flags().IntVar(&runPort, "port", 0, "Port for the HTTP proxy to listen on (host port)")
+	runCmd.Flags().IntVar(&runProxyPort, "proxy-port", 0, "Port for the HTTP proxy to listen on (host port)")
 	runCmd.Flags().StringVar(&runHost, "host", transport.LocalhostIPv4, "Host for the HTTP proxy to listen on (IP or hostname)")
-	if err := runCmd.Flags().MarkDeprecated("port", "use --proxy-port instead"); err != nil {
-		logger.Warnf("Error marking port flag as deprecated: %v", err)
-	}
 	runCmd.Flags().IntVar(&runTargetPort, "target-port", 0,
 		"Port for the container to expose (only applicable to SSE or Streamable HTTP transport)")
 	runCmd.Flags().StringVar(
@@ -223,12 +220,6 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 
 	var imageMetadata *registry.ImageMetadata
 
-	// Determine effective port value
-	effectivePort := 0
-	if runPort != 0 {
-		effectivePort = runPort
-	}
-
 	// Initialize a new RunConfig with values from command-line flags
 	runConfig, err := runner.NewRunConfigBuilder().
 		WithRuntime(rt).
@@ -246,7 +237,7 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 		WithNetworkIsolation(runIsolateNetwork).
 		WithK8sPodPatch(runK8sPodPatch).
 		WithProxyMode(types.ProxyMode("sse")).
-		WithTransportAndPorts(runTransport, effectivePort, runTargetPort).
+		WithTransportAndPorts(runTransport, runProxyPort, runTargetPort).
 		WithAuditEnabled(runEnableAudit, runAuditConfig).
 		WithOIDCConfig(oidcIssuer, oidcAudience, oidcJwksURL, oidcClientID, oidcAllowOpaqueTokens,
 			runThvCABundle, runJWKSAuthTokenFile, runJWKSAllowPrivateIP).

cmd/thv/app/config.go

@@ -19,14 +19,6 @@ var configCmd = &cobra.Command{
 	Long:  "The config command provides subcommands to manage application configuration settings.",
 }
 
-var listRegisteredClientsCmd = &cobra.Command{
-	Use:        "list-registered-clients",
-	Short:      "List all registered MCP clients",
-	Long:       "List all clients that are registered for MCP server configuration.",
-	RunE:       listRegisteredClientsCmdFunc,
-	Deprecated: "please use 'thv client list-registered' instead. This command will be removed in 2 weeks.",
-}
-
 var setCACertCmd = &cobra.Command{
 	Use:   "set-ca-cert <path>",
 	Short: "Set the default CA certificate for container builds",
@@ -79,38 +71,6 @@ var unsetRegistryURLCmd = &cobra.Command{
 	RunE:  unsetRegistryURLCmdFunc,
 }
 
-var registerClientCmd = &cobra.Command{
-	Use:   "register-client [client]",
-	Short: "Register a client for MCP server configuration",
-	Long: `Register a client for MCP server configuration.
-Valid clients are:
-  - claude-code: Claude Code CLI
-  - cline: Cline extension for VS Code
-  - cursor: Cursor editor
-  - roo-code: Roo Code extension for VS Code
-  - vscode: Visual Studio Code
-  - vscode-insider: Visual Studio Code Insiders edition`,
-	Args:       cobra.ExactArgs(1),
-	RunE:       clientRegisterCmdFunc, // delegate to client command
-	Deprecated: "please use 'thv client register' instead. This command will be removed in 2 weeks.",
-}
-
-var removeClientCmd = &cobra.Command{
-	Use:   "remove-client [client]",
-	Short: "Remove a client from MCP server configuration",
-	Long: `Remove a client from MCP server configuration.
-Valid clients are:
-  - claude-code: Claude Code CLI
-  - cline: Cline extension for VS Code
-  - cursor: Cursor editor
-  - roo-code: Roo Code extension for VS Code
-  - vscode: Visual Studio Code
-  - vscode-insider: Visual Studio Code Insiders edition`,
-	Args:       cobra.ExactArgs(1),
-	RunE:       clientRemoveCmdFunc, // delegate to client command
-	Deprecated: "please use 'thv client remove' instead. This command will be removed in 2 weeks.",
-}
-
 var (
 	allowPrivateRegistryIp bool
 )
@@ -120,7 +80,6 @@ func init() {
 	rootCmd.AddCommand(configCmd)
 
 	// Add subcommands to config command
-	configCmd.AddCommand(listRegisteredClientsCmd)
 	configCmd.AddCommand(setCACertCmd)
 	configCmd.AddCommand(getCACertCmd)
 	configCmd.AddCommand(unsetCACertCmd)
@@ -134,8 +93,6 @@ func init() {
 	)
 	configCmd.AddCommand(getRegistryURLCmd)
 	configCmd.AddCommand(unsetRegistryURLCmd)
-	configCmd.AddCommand(registerClientCmd)
-	configCmd.AddCommand(removeClientCmd)
 
 	// Add OTEL parent command to config
 	configCmd.AddCommand(OtelCmd)

cmd/thv/app/run.go

@@ -61,7 +61,6 @@ var (
 	runProxyMode          string
 	runName               string
 	runHost               string
-	runPort               int
 	runProxyPort          int
 	runTargetPort         int
 	runTargetHost         string
@@ -102,10 +101,6 @@ func init() {
 	runCmd.Flags().StringVar(&runName, "name", "", "Name of the MCP server (auto-generated from image if not provided)")
 	runCmd.Flags().StringVar(&runHost, "host", transport.LocalhostIPv4, "Host for the HTTP proxy to listen on (IP or hostname)")
 	runCmd.Flags().IntVar(&runProxyPort, "proxy-port", 0, "Port for the HTTP proxy to listen on (host port)")
-	runCmd.Flags().IntVar(&runPort, "port", 0, "Port for the HTTP proxy to listen on (host port)")
-	if err := runCmd.Flags().MarkDeprecated("port", "use --proxy-port instead"); err != nil {
-		logger.Warnf("Error marking port flag as deprecated: %v", err)
-	}
 	runCmd.Flags().IntVar(&runTargetPort, "target-port", 0,
 		"Port for the container to expose (only applicable to SSE or Streamable HTTP transport)")
 	runCmd.Flags().StringVar(
@@ -347,12 +342,6 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	// Determine effective port value - prefer --proxy-port over --port for backwards compatibility
-	effectivePort := runProxyPort
-	if effectivePort == 0 && runPort != 0 {
-		effectivePort = runPort
-	}
-
 	// Initialize a new RunConfig with values from command-line flags
 	// TODO: As noted elsewhere, we should use the builder pattern here to make it more readable.
 	runConfig, err := runner.NewRunConfigFromFlags(
@@ -372,7 +361,7 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 		runPermissionProfile,
 		runTargetHost,
 		runTransport,
-		effectivePort,
+		runProxyPort,
 		runTargetPort,
 		runEnv,
 		runLabels,

pkg/workloads/manager.go

@@ -320,7 +320,7 @@ func (d *defaultManager) RunWorkloadDetached(ctx context.Context, runConfig *run
 	}
 
 	if runConfig.Port != 0 {
-		detachedArgs = append(detachedArgs, "--port", strconv.Itoa(runConfig.Port))
+		detachedArgs = append(detachedArgs, "--proxy-port", strconv.Itoa(runConfig.Port))
 	}
 
 	if runConfig.TargetPort != 0 {