From f1632c0ddb87dab4e4dc1afefbc0bb1d5067fb21 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 1 May 2022 16:55:26 +0200 Subject: [PATCH] remove some swarm annotations from flags These annotations were added because these options were not supported when using kubernetes as an orchestrator. Now that this feature was removed, we can remove these annotations. Signed-off-by: Sebastiaan van Stijn --- cli/command/service/opts.go | 1 - cli/command/stack/deploy.go | 3 --- 2 files changed, 4 deletions(-) diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go index f7d7fcfa87..0ca067e585 100644 --- a/cli/command/service/opts.go +++ b/cli/command/service/opts.go @@ -840,7 +840,6 @@ func addServiceFlags(flags *pflag.FlagSet, opts *serviceOptions, defaultFlagValu flags.Var(&opts.resources.resMemBytes, flagReserveMemory, "Reserve Memory") flags.Int64Var(&opts.resources.limitPids, flagLimitPids, 0, "Limit maximum number of processes (default 0 = unlimited)") flags.SetAnnotation(flagLimitPids, "version", []string{"1.41"}) - flags.SetAnnotation(flagLimitPids, "swarm", nil) flags.Var(&opts.stopGrace, flagStopGracePeriod, flagDesc(flagStopGracePeriod, "Time to wait before force killing a container (ns|us|ms|s|m|h)")) flags.Var(&opts.replicas, flagReplicas, "Number of tasks") diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go index 89c1215112..9adfaf96bc 100644 --- a/cli/command/stack/deploy.go +++ b/cli/command/stack/deploy.go @@ -36,14 +36,11 @@ func newDeployCommand(dockerCli command.Cli) *cobra.Command { flags.StringSliceVarP(&opts.Composefiles, "compose-file", "c", []string{}, `Path to a Compose file, or "-" to read from stdin`) flags.SetAnnotation("compose-file", "version", []string{"1.25"}) flags.BoolVar(&opts.SendRegistryAuth, "with-registry-auth", false, "Send registry authentication details to Swarm agents") - flags.SetAnnotation("with-registry-auth", "swarm", nil) flags.BoolVar(&opts.Prune, "prune", false, "Prune services that are no longer referenced") flags.SetAnnotation("prune", "version", []string{"1.27"}) - flags.SetAnnotation("prune", "swarm", nil) flags.StringVar(&opts.ResolveImage, "resolve-image", swarm.ResolveImageAlways, `Query the registry to resolve image digest and supported platforms ("`+swarm.ResolveImageAlways+`"|"`+swarm.ResolveImageChanged+`"|"`+swarm.ResolveImageNever+`")`) flags.SetAnnotation("resolve-image", "version", []string{"1.30"}) - flags.SetAnnotation("resolve-image", "swarm", nil) return cmd }