diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 35cb99cf8c7..f4ec9289212 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -59,7 +59,9 @@ func NewKubeletServer() *KubeletServer { // AddFlags adds flags for a specific KubeletServer to the specified FlagSet func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { - fs.StringVar(&s.Config, "config", s.Config, "Path to the config file or directory of files") + fs.StringVar(&s.PodManifestPath, "config", s.PodManifestPath, "Path to to the directory containing pod manifest files to run, or the path to a single pod manifest file.") + fs.MarkDeprecated("config", "Use --pod-manifest-path instead. Will be removed in a future version.") + fs.StringVar(&s.PodManifestPath, "pod-manifest-path", s.PodManifestPath, "Path to to the directory containing pod manifest files to run, or the path to a single pod manifest file.") fs.DurationVar(&s.SyncFrequency.Duration, "sync-frequency", s.SyncFrequency.Duration, "Max period between synchronizing running containers and config") fs.DurationVar(&s.FileCheckFrequency.Duration, "file-check-frequency", s.FileCheckFrequency.Duration, "Duration between checking config files for new data") fs.DurationVar(&s.HTTPCheckFrequency.Duration, "http-check-frequency", s.HTTPCheckFrequency.Duration, "Duration between checking http for new data") diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index e8ab609c348..0b7eb17a4ef 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -208,7 +208,7 @@ func UnsecuredKubeletConfig(s *options.KubeletServer) (*KubeletConfig, error) { Cloud: nil, // cloud provider might start background processes ClusterDNS: net.ParseIP(s.ClusterDNS), ClusterDomain: s.ClusterDomain, - ConfigFile: s.Config, + ConfigFile: s.PodManifestPath, ConfigureCBR0: s.ConfigureCBR0, ContainerManager: nil, ContainerRuntime: s.ContainerRuntime, diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index 6e26d2a16b8..034897ef304 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -361,6 +361,7 @@ path-override pod-cidr pod-eviction-timeout pod-infra-container-image +pod-manifest-path pod-running pods-per-core policy-config-file diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index 7e5cd3431d8..3bf147e1110 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -1311,17 +1311,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym138 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Config)) + r.EncodeString(codecSelferC_UTF81234, string(x.PodManifestPath)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("config")) + r.EncodeString(codecSelferC_UTF81234, string("podManifestPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym139 := z.EncBinary() _ = yym139 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Config)) + r.EncodeString(codecSelferC_UTF81234, string(x.PodManifestPath)) } } if yyr130 || yy2arr130 { @@ -3437,11 +3437,11 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } else { x.APIVersion = string(r.DecodeString()) } - case "config": + case "podManifestPath": if r.TryDecodeAsNil() { - x.Config = "" + x.PodManifestPath = "" } else { - x.Config = string(r.DecodeString()) + x.PodManifestPath = string(r.DecodeString()) } case "syncFrequency": if r.TryDecodeAsNil() { @@ -4202,9 +4202,9 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Config = "" + x.PodManifestPath = "" } else { - x.Config = string(r.DecodeString()) + x.PodManifestPath = string(r.DecodeString()) } yyj561++ if yyhl561 { diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 5b6fce71e1b..22f37b5f86f 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -112,8 +112,9 @@ const ( type KubeletConfiguration struct { unversioned.TypeMeta - // config is the path to the config file or directory of files - Config string `json:"config"` + // podManifestPath is the path to the directory containing pod manifests to + // run, or the path to a single manifest file + PodManifestPath string `json:"podManifestPath"` // syncFrequency is the max period between synchronizing running // containers and config SyncFrequency unversioned.Duration `json:"syncFrequency"` diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 681bce3d67b..007bf14f644 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -166,8 +166,9 @@ type LeaderElectionConfiguration struct { type KubeletConfiguration struct { unversioned.TypeMeta - // config is the path to the config file or directory of files - Config string `json:"config"` + // podManifestPath is the path to the directory containing pod manifests to + // run, or the path to a single manifest file + PodManifestPath string `json:"podManifestPath"` // syncFrequency is the max period between synchronizing running // containers and config SyncFrequency unversioned.Duration `json:"syncFrequency"` diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go index d9a2d8cbe8e..7031454689f 100644 --- a/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go @@ -162,7 +162,7 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err } - out.Config = in.Config + out.PodManifestPath = in.PodManifestPath out.SyncFrequency = in.SyncFrequency out.FileCheckFrequency = in.FileCheckFrequency out.HTTPCheckFrequency = in.HTTPCheckFrequency @@ -326,7 +326,7 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { return err } - out.Config = in.Config + out.PodManifestPath = in.PodManifestPath out.SyncFrequency = in.SyncFrequency out.FileCheckFrequency = in.FileCheckFrequency out.HTTPCheckFrequency = in.HTTPCheckFrequency diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go index f279cc361aa..ea672ed5e74 100644 --- a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go @@ -111,7 +111,7 @@ func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c * in := in.(*KubeletConfiguration) out := out.(*KubeletConfiguration) out.TypeMeta = in.TypeMeta - out.Config = in.Config + out.PodManifestPath = in.PodManifestPath out.SyncFrequency = in.SyncFrequency out.FileCheckFrequency = in.FileCheckFrequency out.HTTPCheckFrequency = in.HTTPCheckFrequency diff --git a/pkg/apis/componentconfig/zz_generated.deepcopy.go b/pkg/apis/componentconfig/zz_generated.deepcopy.go index f2d7f30833f..4af9e5f59ca 100644 --- a/pkg/apis/componentconfig/zz_generated.deepcopy.go +++ b/pkg/apis/componentconfig/zz_generated.deepcopy.go @@ -185,7 +185,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface in := in.(*KubeletConfiguration) out := out.(*KubeletConfiguration) out.TypeMeta = in.TypeMeta - out.Config = in.Config + out.PodManifestPath = in.PodManifestPath out.SyncFrequency = in.SyncFrequency out.FileCheckFrequency = in.FileCheckFrequency out.HTTPCheckFrequency = in.HTTPCheckFrequency