Merge pull request docker#4366 from thaJeztah/remove_deprecated_conte…

…xt_stubs cli/command/context: remove deprecated k8s / orchestrator option-stubs
thaJeztah · Jun 28, 2023 · 27bae11 · 27bae11
2 parents fcaf1de + 2133d04
commit 27bae11
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/cli/command/context/create.go b/cli/command/context/create.go
@@ -51,18 +51,7 @@ func newCreateCommand(dockerCli command.Cli) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	flags.StringVar(&opts.Description, "description", "", "Description of the context")
-	flags.String(
-		"default-stack-orchestrator", "",
-		`Default orchestrator for stack operations to use with this context ("swarm", "kubernetes", "all")`,
-	)
-	flags.SetAnnotation("default-stack-orchestrator", "deprecated", nil)
-	flags.SetAnnotation("default-stack-orchestrator", "deprecated", nil)
-	flags.MarkDeprecated("default-stack-orchestrator", "option will be ignored")
 	flags.StringToStringVar(&opts.Docker, "docker", nil, "set the docker endpoint")
-	flags.StringToString("kubernetes", nil, "set the kubernetes endpoint")
-	flags.SetAnnotation("kubernetes", "kubernetes", nil)
-	flags.SetAnnotation("kubernetes", "deprecated", nil)
-	flags.MarkDeprecated("kubernetes", "option will be ignored")
 	flags.StringVar(&opts.From, "from", "", "create context from a named context")
 	return cmd
 }

diff --git a/cli/command/context/export.go b/cli/command/context/export.go
@@ -19,13 +19,14 @@ type ExportOptions struct {
 }
 
 func newExportCommand(dockerCli command.Cli) *cobra.Command {
-	opts := &ExportOptions{}
-	cmd := &cobra.Command{
+	return &cobra.Command{
 		Use:   "export [OPTIONS] CONTEXT [FILE|-]",
 		Short: "Export a context to a tar archive FILE or a tar stream on STDOUT.",
 		Args:  cli.RequiresRangeArgs(1, 2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.ContextName = args[0]
+			opts := &ExportOptions{
+				ContextName: args[0],
+			}
 			if len(args) == 2 {
 				opts.Dest = args[1]
 			} else {
@@ -34,13 +35,6 @@ func newExportCommand(dockerCli command.Cli) *cobra.Command {
 			return RunExport(dockerCli, opts)
 		},
 	}
-
-	flags := cmd.Flags()
-	flags.Bool("kubeconfig", false, "Export as a kubeconfig file")
-	flags.MarkDeprecated("kubeconfig", "option will be ignored")
-	flags.SetAnnotation("kubeconfig", "kubernetes", nil)
-	flags.SetAnnotation("kubeconfig", "deprecated", nil)
-	return cmd
 }
 
 func writeTo(dockerCli command.Cli, reader io.Reader, dest string) error {

diff --git a/cli/command/context/update.go b/cli/command/context/update.go
@@ -47,17 +47,7 @@ func newUpdateCommand(dockerCli command.Cli) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	flags.StringVar(&opts.Description, "description", "", "Description of the context")
-	flags.String(
-		"default-stack-orchestrator", "",
-		"Default orchestrator for stack operations to use with this context (swarm|kubernetes|all)",
-	)
-	flags.SetAnnotation("default-stack-orchestrator", "deprecated", nil)
-	flags.MarkDeprecated("default-stack-orchestrator", "option will be ignored")
 	flags.StringToStringVar(&opts.Docker, "docker", nil, "set the docker endpoint")
-	flags.StringToString("kubernetes", nil, "set the kubernetes endpoint")
-	flags.SetAnnotation("kubernetes", "kubernetes", nil)
-	flags.SetAnnotation("kubernetes", "deprecated", nil)
-	flags.MarkDeprecated("kubernetes", "option will be ignored")
 	return cmd
 }