From 794d0d9b4d82088a8d3ca6e2a048f19bb4e7efda Mon Sep 17 00:00:00 2001 From: mattjmcnaughton Date: Sun, 5 Jan 2020 09:27:38 -0500 Subject: [PATCH] Remove `rkt` from container runtime options Part of efforts to clean up mentions of rkt in kubelet. rkt was removed entirely in 1.11, in favor of using `rktlet` and CRI instead. It should no longer be listed at all as a runtime. --- pkg/kubelet/config/flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/config/flags.go b/pkg/kubelet/config/flags.go index 458901205db..9f93855c50c 100644 --- a/pkg/kubelet/config/flags.go +++ b/pkg/kubelet/config/flags.go @@ -83,7 +83,7 @@ func (s *ContainerRuntimeOptions) AddFlags(fs *pflag.FlagSet) { dockerOnlyWarning := "This docker-specific flag only works when container-runtime is set to docker." // General settings. - fs.StringVar(&s.ContainerRuntime, "container-runtime", s.ContainerRuntime, "The container runtime to use. Possible values: 'docker', 'remote', 'rkt (deprecated)'.") + fs.StringVar(&s.ContainerRuntime, "container-runtime", s.ContainerRuntime, "The container runtime to use. Possible values: 'docker', 'remote'.") fs.StringVar(&s.RuntimeCgroups, "runtime-cgroups", s.RuntimeCgroups, "Optional absolute name of cgroups to create and run the runtime in.") fs.BoolVar(&s.RedirectContainerStreaming, "redirect-container-streaming", s.RedirectContainerStreaming, "Enables container streaming redirect. If false, kubelet will proxy container streaming data between apiserver and container runtime; if true, kubelet will return an http redirect to apiserver, and apiserver will access container runtime directly. The proxy approach is more secure, but introduces some overhead. The redirect approach is more performant, but less secure because the connection between apiserver and container runtime may not be authenticated.")