From 7f5ce68d61c92f49e4169c1ab678113f95d8bcb2 Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Tue, 17 Jan 2017 15:16:37 -0800 Subject: [PATCH] Remove deprecated --resource-container flag --- cmd/kubelet/app/options/options.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 9f9c3f1e4b9..6467e5b1e56 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -183,8 +183,6 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.FeatureGates, "feature-gates", s.FeatureGates, "A set of key=value pairs that describe feature gates for alpha/experimental features. "+ "Options are:\n"+strings.Join(utilfeature.DefaultFeatureGate.KnownFeatures(), "\n")) - fs.StringVar(&s.KubeletCgroups, "resource-container", s.KubeletCgroups, "Optional absolute name of the resource-only container to create and run the Kubelet in.") - fs.MarkDeprecated("resource-container", "Use --kubelet-cgroups instead. Will be removed in a future version.") fs.StringVar(&s.KubeletCgroups, "kubelet-cgroups", s.KubeletCgroups, "Optional absolute name of cgroups to create and run the Kubelet in.") fs.StringVar(&s.SystemCgroups, "system-container", s.SystemCgroups, "Optional resource-only container in which to place all non-kernel processes that are not already in a container. Empty for no container. Rolling back the flag requires a reboot. (Default: \"\").")