stern
diff --git a/‎README.md
Lines changed: 2 additions & 2 deletions b/‎README.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎cmd/flag_completion.go
Lines changed: 15 additions & 0 deletions b/‎cmd/flag_completion.go
Lines changed: 15 additions & 0 deletions
@@ -234,8 +234,8 @@ stern -p
 Stern supports command-line auto completion for bash, zsh or fish. `stern
 --completion=(bash|zsh|fish)` outputs the shell completion code which work by being
 evaluated in `.bashrc`, etc for the specified shell. In addition, Stern
-supports dynamic completion for `--namespace`, `--context` and a resource query
-in the form `<resource>/<name>`.
+supports dynamic completion for `--namespace`, `--context`, a resource query
+in the form `<resource>/<name>`, and flags with pre-defined choices.
 
 If you use bash, stern bash completion code depends on the
 [bash-completion](https://github.com/scop/bash-completion). On the macOS, you
 
@@ -29,6 +29,13 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 )
 
+var flagChoices = map[string][]string{
+	"color":           []string{"always", "never", "auto"},
+	"completion":      []string{"bash", "zsh", "fish"},
+	"container-state": []string{stern.RUNNING, stern.WAITING, stern.TERMINATED},
+	"output":          []string{"default", "raw", "json", "extjson", "ppextjson"},
+}
+
 func runCompletion(shell string, cmd *cobra.Command, out io.Writer) error {
 	var err error
 
@@ -72,6 +79,14 @@ func registerCompletionFuncForFlags(cmd *cobra.Command, o *options) error {
 		return err
 	}
 
+	// flags with pre-defined choices
+	for flag, choices := range flagChoices {
+		if err := cmd.RegisterFlagCompletionFunc(flag,
+			cobra.FixedCompletions(choices, cobra.ShellCompDirectiveNoFileComp)); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }