Merge pull request #60994 from joejulian/add_remote_flag_option

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add missing container-runtime "remote" option **What this PR does / why we need it**: Added the "remote" option to the auto-generated documentation for the `--container-runtime` flag. The kubelet flag `--container-runtime` lists the possible values as part of the auto-generated documentation but is missing the "remote" possibility. **Which issue(s) this PR fixes** : Fixes #60992 **Release note**: ```release-note NONE ```

Merge pull request #60994 from joejulian/add_remote_flag_option
a1c69341 · Kubernetes Submit Queue · GitHub · ddbd5730 · 8f4438b8 · a1c69341
Unverified Commit a1c69341 authored Mar 12, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

flags.go pkg/kubelet/config/flags.go +1 -1

No files found.
--- a/pkg/kubelet/config/flags.go
+++ b/pkg/kubelet/config/flags.go
@@ -81,7 +81,7 @@ type ContainerRuntimeOptions struct {

 func (s *ContainerRuntimeOptions) AddFlags(fs *pflag.FlagSet) {
 	// General settings.
-	fs.StringVar(&s.ContainerRuntime, "container-runtime", s.ContainerRuntime, "The container runtime to use. Possible values: 'docker', 'rkt'.")
+	fs.StringVar(&s.ContainerRuntime, "container-runtime", s.ContainerRuntime, "The container runtime to use. Possible values: 'docker', 'remote', 'rkt (deprecated)'.")
 	fs.StringVar(&s.RuntimeCgroups, "runtime-cgroups", s.RuntimeCgroups, "Optional absolute name of cgroups to create and run the runtime in.")

 	// Docker-specific settings.