From 56d60cfae60ed5f9da50e9913d66d90786c143e9 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 19 Jan 2017 13:39:13 +0100 Subject: [PATCH] pkg/util: move flags from pkg/util/config to pkg/util/flags --- cmd/cloud-controller-manager/app/options/options.go | 4 ++-- cmd/kube-controller-manager/app/options/options.go | 4 ++-- cmd/kube-controller-manager/app/plugins.go | 4 ++-- cmd/kube-proxy/app/options/options.go | 4 ++-- cmd/kubelet/app/options/options.go | 6 +++--- cmd/kubelet/app/server.go | 8 ++++---- cmd/kubelet/app/server_test.go | 6 +++--- .../app/controllermanager.go | 4 ++-- .../app/controllermanager_test.go | 10 +++++----- .../app/options/options.go | 6 +++--- pkg/api/validation/validation.go | 4 ++-- pkg/apis/componentconfig/types.go | 6 +++--- pkg/genericapiserver/registry/generic/rest/proxy.go | 4 ++-- .../server/options/server_run_options.go | 8 ++++---- pkg/genericapiserver/server/options/serving.go | 6 +++--- pkg/kubeapiserver/default_storage_factory_builder.go | 8 ++++---- pkg/kubelet/kubelet.go | 8 ++++---- pkg/proxy/iptables/proxier.go | 6 +++--- pkg/registry/core/service/rest.go | 4 ++-- pkg/registry/core/service/rest_test.go | 4 ++-- pkg/security/apparmor/validate.go | 4 ++-- pkg/util/{config => flag}/configuration_map.go | 2 +- pkg/util/{config => flag}/feature_gate.go | 2 +- pkg/util/{config => flag}/feature_gate_test.go | 2 +- pkg/util/{config => flag}/namedcertkey_flag.go | 2 +- pkg/util/{config => flag}/namedcertkey_flag_test.go | 2 +- plugin/cmd/kube-scheduler/app/options/options.go | 4 ++-- test/e2e_node/services/services.go | 4 ++-- 28 files changed, 68 insertions(+), 68 deletions(-) rename pkg/util/{config => flag}/configuration_map.go (98%) rename pkg/util/{config => flag}/feature_gate.go (99%) rename pkg/util/{config => flag}/feature_gate_test.go (99%) rename pkg/util/{config => flag}/namedcertkey_flag.go (99%) rename pkg/util/{config => flag}/namedcertkey_flag_test.go (99%) diff --git a/cmd/cloud-controller-manager/app/options/options.go b/cmd/cloud-controller-manager/app/options/options.go index 4c93aaaf5a..5bc7dfd261 100644 --- a/cmd/cloud-controller-manager/app/options/options.go +++ b/cmd/cloud-controller-manager/app/options/options.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/master/ports" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/pflag" ) @@ -82,5 +82,5 @@ func (s *CloudControllerManagerServer) AddFlags(fs *pflag.FlagSet) { fs.DurationVar(&s.ControllerStartInterval.Duration, "controller-start-interval", s.ControllerStartInterval.Duration, "Interval between starting controller managers.") leaderelection.BindFlags(&s.LeaderElection, fs) - config.DefaultFeatureGate.AddFlag(fs) + utilflag.DefaultFeatureGate.AddFlag(fs) } diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index cf9255e34a..126c25c3e0 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/master/ports" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/pflag" ) @@ -195,7 +195,7 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet, allControllers []string, disabled fs.DurationVar(&s.ReconcilerSyncLoopPeriod.Duration, "attach-detach-reconcile-sync-period", s.ReconcilerSyncLoopPeriod.Duration, "The reconciler sync wait time between volume attach detach. This duration must be larger than one second, and increasing this value from the default may allow for volumes to be mismatched with pods.") leaderelection.BindFlags(&s.LeaderElection, fs) - config.DefaultFeatureGate.AddFlag(fs) + utilflag.DefaultFeatureGate.AddFlag(fs) } // Validate is used to validate the options and config before launching the controller manager diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go index afe95be7e3..4f84d200b7 100644 --- a/cmd/kube-controller-manager/app/plugins.go +++ b/cmd/kube-controller-manager/app/plugins.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack" "k8s.io/kubernetes/pkg/cloudprovider/providers/photon" "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" - utilconfig "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/aws_ebs" @@ -142,7 +142,7 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config componen // TODO: remove in Kubernetes 1.5 func NewAlphaVolumeProvisioner(cloud cloudprovider.Interface, config componentconfig.VolumeConfiguration) (volume.ProvisionableVolumePlugin, error) { switch { - case !utilconfig.DefaultFeatureGate.DynamicVolumeProvisioning(): + case !utilflag.DefaultFeatureGate.DynamicVolumeProvisioning(): return nil, nil case cloud == nil && config.EnableHostPathProvisioning: return getProvisionablePluginFromVolumePlugins(host_path.ProbeVolumePlugins( diff --git a/cmd/kube-proxy/app/options/options.go b/cmd/kube-proxy/app/options/options.go index 0ea68fb1b8..b865c432d5 100644 --- a/cmd/kube-proxy/app/options/options.go +++ b/cmd/kube-proxy/app/options/options.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/pflag" ) @@ -101,5 +101,5 @@ func (s *ProxyServerConfig) AddFlags(fs *pflag.FlagSet) { s.ConntrackTCPCloseWaitTimeout.Duration, "NAT timeout for TCP connections in the CLOSE_WAIT state") - config.DefaultFeatureGate.AddFlag(fs) + utilflag.DefaultFeatureGate.AddFlag(fs) } diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 8de599a758..e7c1b94eb9 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" - utilconfig "k8s.io/kubernetes/pkg/util/config" "k8s.io/kubernetes/pkg/util/flag" + utilflag "k8s.io/kubernetes/pkg/util/flag" utiltaints "k8s.io/kubernetes/pkg/util/taints" "github.com/spf13/pflag" @@ -169,7 +169,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.DurationVar(&s.StreamingConnectionIdleTimeout.Duration, "streaming-connection-idle-timeout", s.StreamingConnectionIdleTimeout.Duration, "Maximum time a streaming connection can be idle before the connection is automatically closed. 0 indicates no timeout. Example: '5m'") fs.DurationVar(&s.NodeStatusUpdateFrequency.Duration, "node-status-update-frequency", s.NodeStatusUpdateFrequency.Duration, "Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. Default: 10s") s.NodeLabels = make(map[string]string) - bindableNodeLabels := utilconfig.ConfigurationMap(s.NodeLabels) + bindableNodeLabels := utilflag.ConfigurationMap(s.NodeLabels) fs.Var(&bindableNodeLabels, "node-labels", " Labels to add when registering the node in the cluster. Labels must be key=value pairs separated by ','.") fs.DurationVar(&s.ImageMinimumGCAge.Duration, "minimum-image-ttl-duration", s.ImageMinimumGCAge.Duration, "Minimum age for an unused image before it is garbage collected. Examples: '300ms', '10s' or '2h45m'. Default: '2m'") fs.Int32Var(&s.ImageGCHighThresholdPercent, "image-gc-high-threshold", s.ImageGCHighThresholdPercent, "The percent of disk usage after which image garbage collection is always run. Default: 90%") @@ -185,7 +185,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.CloudProvider, "cloud-provider", s.CloudProvider, "The provider for cloud services. By default, kubelet will attempt to auto-detect the cloud provider. Specify empty string for running with no cloud provider. [default=auto-detect]") fs.StringVar(&s.CloudConfigFile, "cloud-config", s.CloudConfigFile, "The path to the cloud provider configuration file. Empty string for no configuration file.") 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(utilconfig.DefaultFeatureGate.KnownFeatures(), "\n")) + "Options are:\n"+strings.Join(utilflag.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.") diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 552e90ab0a..f310a47273 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -70,8 +70,8 @@ import ( "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubelet/server" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - utilconfig "k8s.io/kubernetes/pkg/util/config" "k8s.io/kubernetes/pkg/util/configz" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flock" kubeio "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" @@ -328,14 +328,14 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) { } // Set feature gates based on the value in KubeletConfiguration - err = utilconfig.DefaultFeatureGate.Set(s.KubeletConfiguration.FeatureGates) + err = utilflag.DefaultFeatureGate.Set(s.KubeletConfiguration.FeatureGates) if err != nil { return err } // Register current configuration with /configz endpoint cfgz, cfgzErr := initConfigz(&s.KubeletConfiguration) - if utilconfig.DefaultFeatureGate.DynamicKubeletConfig() { + if utilflag.DefaultFeatureGate.DynamicKubeletConfig() { // Look for config on the API server. If it exists, replace s.KubeletConfiguration // with it and continue. initKubeletConfigSync also starts the background thread that checks for new config. @@ -352,7 +352,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) { setConfigz(cfgz, &s.KubeletConfiguration) } // Update feature gates from the new config - err = utilconfig.DefaultFeatureGate.Set(s.KubeletConfiguration.FeatureGates) + err = utilflag.DefaultFeatureGate.Set(s.KubeletConfiguration.FeatureGates) if err != nil { return err } diff --git a/cmd/kubelet/app/server_test.go b/cmd/kubelet/app/server_test.go index 478e16fb44..71304f3e4f 100644 --- a/cmd/kubelet/app/server_test.go +++ b/cmd/kubelet/app/server_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/kubelet" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" ) func TestValueOfAllocatableResources(t *testing.T) { @@ -51,8 +51,8 @@ func TestValueOfAllocatableResources(t *testing.T) { } for _, test := range testCases { - kubeReservedCM := make(config.ConfigurationMap) - systemReservedCM := make(config.ConfigurationMap) + kubeReservedCM := make(utilflag.ConfigurationMap) + systemReservedCM := make(utilflag.ConfigurationMap) kubeReservedCM.Set(test.kubeReserved) systemReservedCM.Set(test.systemReserved) diff --git a/federation/cmd/federation-controller-manager/app/controllermanager.go b/federation/cmd/federation-controller-manager/app/controllermanager.go index a153753c71..2879781b43 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager.go @@ -45,6 +45,7 @@ import ( servicecontroller "k8s.io/kubernetes/federation/pkg/federation-controller/service" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/util/configz" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/version" "github.com/golang/glog" @@ -53,7 +54,6 @@ import ( "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/client/typed/discovery" - "k8s.io/kubernetes/pkg/util/config" ) const ( @@ -222,7 +222,7 @@ func restClientConfigFromSecret(master string) (*restclient.Config, error) { return restClientCfg, nil } -func controllerEnabled(controllers config.ConfigurationMap, serverResources []*metav1.APIResourceList, controller string, requiredResources []schema.GroupVersionResource, defaultValue bool) bool { +func controllerEnabled(controllers utilflag.ConfigurationMap, serverResources []*metav1.APIResourceList, controller string, requiredResources []schema.GroupVersionResource, defaultValue bool) bool { controllerConfig, ok := controllers[controller] if ok { if controllerConfig == "false" { diff --git a/federation/cmd/federation-controller-manager/app/controllermanager_test.go b/federation/cmd/federation-controller-manager/app/controllermanager_test.go index 6522efb047..c7ded00197 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager_test.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager_test.go @@ -20,14 +20,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" ingresscontroller "k8s.io/kubernetes/federation/pkg/federation-controller/ingress" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "testing" ) func TestControllerEnabled(t *testing.T) { testCases := []struct { - controllersConfig config.ConfigurationMap + controllersConfig utilflag.ConfigurationMap serverResources []*metav1.APIResourceList controller string requiredResources []schema.GroupVersionResource @@ -36,7 +36,7 @@ func TestControllerEnabled(t *testing.T) { }{ // no override, API server has Ingress enabled { - controllersConfig: config.ConfigurationMap{}, + controllersConfig: utilflag.ConfigurationMap{}, serverResources: []*metav1.APIResourceList{ { GroupVersion: "extensions/v1beta1", @@ -52,7 +52,7 @@ func TestControllerEnabled(t *testing.T) { }, // no override, API server has Ingress disabled { - controllersConfig: config.ConfigurationMap{}, + controllersConfig: utilflag.ConfigurationMap{}, serverResources: []*metav1.APIResourceList{}, controller: ingresscontroller.ControllerName, requiredResources: ingresscontroller.RequiredResources, @@ -61,7 +61,7 @@ func TestControllerEnabled(t *testing.T) { }, // API server has Ingress enabled, override config to disable Ingress controller { - controllersConfig: config.ConfigurationMap{ + controllersConfig: utilflag.ConfigurationMap{ ingresscontroller.ControllerName: "false", }, serverResources: []*metav1.APIResourceList{ diff --git a/federation/cmd/federation-controller-manager/app/options/options.go b/federation/cmd/federation-controller-manager/app/options/options.go index 1d81c5c79d..7ded0b38db 100644 --- a/federation/cmd/federation-controller-manager/app/options/options.go +++ b/federation/cmd/federation-controller-manager/app/options/options.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/federation/pkg/dnsprovider" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/leaderelection" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" ) type ControllerManagerConfiguration struct { @@ -69,7 +69,7 @@ type ControllerManagerConfiguration struct { // contentType is contentType of requests sent to apiserver. ContentType string `json:"contentType"` // ConfigurationMap determining which controllers should be enabled or disabled - Controllers config.ConfigurationMap `json:"controllers"` + Controllers utilflag.ConfigurationMap `json:"controllers"` } // CMServer is the main context object for the controller manager. @@ -97,7 +97,7 @@ func NewCMServer() *CMServer { APIServerQPS: 20.0, APIServerBurst: 30, LeaderElection: leaderelection.DefaultLeaderElectionConfiguration(), - Controllers: make(config.ConfigurationMap), + Controllers: make(utilflag.ConfigurationMap), }, } return &s diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index eefc981e3f..b524d4f363 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -44,7 +44,7 @@ import ( storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/security/apparmor" - utilconfig "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -2063,7 +2063,7 @@ func ValidateAppArmorPodAnnotations(annotations map[string]string, spec *api.Pod if !strings.HasPrefix(k, apparmor.ContainerAnnotationKeyPrefix) { continue } - if !utilconfig.DefaultFeatureGate.AppArmor() { + if !utilflag.DefaultFeatureGate.AppArmor() { allErrs = append(allErrs, field.Forbidden(fldPath.Key(k), "AppArmor is disabled by feature-gate")) continue } diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 707e66f5e5..04ba64149d 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - utilconfig "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" ) type KubeProxyConfiguration struct { @@ -445,12 +445,12 @@ type KubeletConfiguration struct { // that describe resources reserved for non-kubernetes components. // Currently only cpu and memory are supported. [default=none] // See http://kubernetes.io/docs/user-guide/compute-resources for more detail. - SystemReserved utilconfig.ConfigurationMap + SystemReserved utilflag.ConfigurationMap // A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs // that describe resources reserved for kubernetes system components. // Currently only cpu and memory are supported. [default=none] // See http://kubernetes.io/docs/user-guide/compute-resources for more detail. - KubeReserved utilconfig.ConfigurationMap + KubeReserved utilflag.ConfigurationMap // Default behaviour for kernel tuning ProtectKernelDefaults bool // If true, Kubelet ensures a set of iptables rules are present on host. diff --git a/pkg/genericapiserver/registry/generic/rest/proxy.go b/pkg/genericapiserver/registry/generic/rest/proxy.go index 3262092d16..295c4b5fbc 100644 --- a/pkg/genericapiserver/registry/generic/rest/proxy.go +++ b/pkg/genericapiserver/registry/generic/rest/proxy.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" utilnet "k8s.io/apimachinery/pkg/util/net" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - utilconfig "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/proxy" @@ -145,7 +145,7 @@ func (h *UpgradeAwareProxyHandler) tryUpgrade(w http.ResponseWriter, req *http.R rawResponse []byte err error ) - if h.InterceptRedirects && utilconfig.DefaultFeatureGate.StreamingProxyRedirects() { + if h.InterceptRedirects && utilflag.DefaultFeatureGate.StreamingProxyRedirects() { backendConn, rawResponse, err = h.connectBackendWithRedirects(req) } else { backendConn, err = h.connectBackend(req.Method, h.Location, req.Header, req.Body) diff --git a/pkg/genericapiserver/server/options/server_run_options.go b/pkg/genericapiserver/server/options/server_run_options.go index b51f4ff2f4..2d4c6088fa 100644 --- a/pkg/genericapiserver/server/options/server_run_options.go +++ b/pkg/genericapiserver/server/options/server_run_options.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/pflag" ) @@ -52,7 +52,7 @@ type ServerRunOptions struct { MaxRequestsInFlight int MaxMutatingRequestsInFlight int MinRequestTimeout int - RuntimeConfig config.ConfigurationMap + RuntimeConfig utilflag.ConfigurationMap StorageVersions string // The default values for StorageVersions. StorageVersions overrides // these; you can change this if you want to change the defaults (e.g., @@ -75,7 +75,7 @@ func NewServerRunOptions() *ServerRunOptions { MaxRequestsInFlight: 400, MaxMutatingRequestsInFlight: 200, MinRequestTimeout: 1800, - RuntimeConfig: make(config.ConfigurationMap), + RuntimeConfig: make(utilflag.ConfigurationMap), StorageVersions: api.Registry.AllPreferredGroupVersions(), } } @@ -264,5 +264,5 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) { "The individual override format: resource#size, where size is a number. It takes effect "+ "when watch-cache is enabled.") - config.DefaultFeatureGate.AddFlag(fs) + utilflag.DefaultFeatureGate.AddFlag(fs) } diff --git a/pkg/genericapiserver/server/options/serving.go b/pkg/genericapiserver/server/options/serving.go index 0e13d17b69..fabe42a0fe 100644 --- a/pkg/genericapiserver/server/options/serving.go +++ b/pkg/genericapiserver/server/options/serving.go @@ -26,7 +26,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" certutil "k8s.io/client-go/util/cert" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" ) type ServingOptions struct { @@ -40,7 +40,7 @@ type SecureServingOptions struct { // ServerCert is the TLS cert info for serving secure traffic ServerCert GeneratableKeyCert // SNICertKeys are named CertKeys for serving secure traffic with SNI support. - SNICertKeys []config.NamedCertKey + SNICertKeys []utilflag.NamedCertKey } type CertKey struct { @@ -114,7 +114,7 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) { "Controllers. This must be a valid PEM-encoded CA bundle. Altneratively, the certificate authority "+ "can be appended to the certificate provided by --tls-cert-file.") - fs.Var(config.NewNamedCertKeyArray(&s.SNICertKeys), "tls-sni-cert-key", ""+ + fs.Var(utilflag.NewNamedCertKeyArray(&s.SNICertKeys), "tls-sni-cert-key", ""+ "A pair of x509 certificate and private key file paths, optionally suffixed with a list of "+ "domain patterns which are fully qualified domain names, possibly with prefixed wildcard "+ "segments. If no domain patterns are provided, the names of the certificate are "+ diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index 40df70b16d..b63fcd905d 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" ) // Builds the DefaultStorageFactory. @@ -34,7 +34,7 @@ import ( // defaultAPIResourceConfig with the corresponding user specified overrides as well. func BuildDefaultStorageFactory(storageConfig storagebackend.Config, defaultMediaType string, serializer runtime.StorageSerializer, defaultResourceEncoding *genericapiserver.DefaultResourceEncodingConfig, storageEncodingOverrides map[string]schema.GroupVersion, resourceEncodingOverrides []schema.GroupVersionResource, - defaultAPIResourceConfig *genericapiserver.ResourceConfig, resourceConfigOverrides config.ConfigurationMap) (*genericapiserver.DefaultStorageFactory, error) { + defaultAPIResourceConfig *genericapiserver.ResourceConfig, resourceConfigOverrides utilflag.ConfigurationMap) (*genericapiserver.DefaultStorageFactory, error) { resourceEncodingConfig := mergeGroupEncodingConfigs(defaultResourceEncoding, storageEncodingOverrides) resourceEncodingConfig = mergeResourceEncodingConfigs(resourceEncodingConfig, resourceEncodingOverrides) @@ -65,7 +65,7 @@ func mergeGroupEncodingConfigs(defaultResourceEncoding *genericapiserver.Default } // Merges the given defaultAPIResourceConfig with the given resourceConfigOverrides. -func mergeAPIResourceConfigs(defaultAPIResourceConfig *genericapiserver.ResourceConfig, resourceConfigOverrides config.ConfigurationMap) (*genericapiserver.ResourceConfig, error) { +func mergeAPIResourceConfigs(defaultAPIResourceConfig *genericapiserver.ResourceConfig, resourceConfigOverrides utilflag.ConfigurationMap) (*genericapiserver.ResourceConfig, error) { resourceConfig := defaultAPIResourceConfig overrides := resourceConfigOverrides @@ -164,7 +164,7 @@ func mergeAPIResourceConfigs(defaultAPIResourceConfig *genericapiserver.Resource return resourceConfig, nil } -func getRuntimeConfigValue(overrides config.ConfigurationMap, apiKey string, defaultValue bool) (bool, error) { +func getRuntimeConfigValue(overrides utilflag.ConfigurationMap, apiKey string, defaultValue bool) (bool, error) { flagValue, ok := overrides[apiKey] if ok { if flagValue == "" { diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 43bc49608f..2bfa683f08 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -88,9 +88,9 @@ import ( "k8s.io/kubernetes/pkg/kubelet/volumemanager" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/util/bandwidth" - utilconfig "k8s.io/kubernetes/pkg/util/config" utildbus "k8s.io/kubernetes/pkg/util/dbus" utilexec "k8s.io/kubernetes/pkg/util/exec" + utilflag "k8s.io/kubernetes/pkg/util/flag" kubeio "k8s.io/kubernetes/pkg/util/io" utilipt "k8s.io/kubernetes/pkg/util/iptables" "k8s.io/kubernetes/pkg/util/mount" @@ -474,7 +474,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub makeIPTablesUtilChains: kubeCfg.MakeIPTablesUtilChains, iptablesMasqueradeBit: int(kubeCfg.IPTablesMasqueradeBit), iptablesDropBit: int(kubeCfg.IPTablesDropBit), - experimentalHostUserNamespaceDefaulting: utilconfig.DefaultFeatureGate.ExperimentalHostUserNamespaceDefaulting(), + experimentalHostUserNamespaceDefaulting: utilflag.DefaultFeatureGate.ExperimentalHostUserNamespaceDefaulting(), } if klet.experimentalHostUserNamespaceDefaulting { @@ -2144,7 +2144,7 @@ func isSyncPodWorthy(event *pleg.PodLifecycleEvent) bool { // parseResourceList parses the given configuration map into an API // ResourceList or returns an error. -func parseResourceList(m utilconfig.ConfigurationMap) (v1.ResourceList, error) { +func parseResourceList(m utilflag.ConfigurationMap) (v1.ResourceList, error) { rl := make(v1.ResourceList) for k, v := range m { switch v1.ResourceName(k) { @@ -2168,7 +2168,7 @@ func parseResourceList(m utilconfig.ConfigurationMap) (v1.ResourceList, error) { // ParseReservation parses the given kubelet- and system- reservations // configuration maps into an internal Reservation instance or returns an // error. -func ParseReservation(kubeReserved, systemReserved utilconfig.ConfigurationMap) (*kubetypes.Reservation, error) { +func ParseReservation(kubeReserved, systemReserved utilflag.ConfigurationMap) (*kubetypes.Reservation, error) { reservation := new(kubetypes.Reservation) if rl, err := parseResourceList(kubeReserved); err != nil { return nil, err diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 41547bd883..7c0b2b43d2 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -43,8 +43,8 @@ import ( "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/healthcheck" - featuregate "k8s.io/kubernetes/pkg/util/config" utilexec "k8s.io/kubernetes/pkg/util/exec" + utilflag "k8s.io/kubernetes/pkg/util/flag" utiliptables "k8s.io/kubernetes/pkg/util/iptables" "k8s.io/kubernetes/pkg/util/slice" utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" @@ -154,7 +154,7 @@ type endpointsInfo struct { // returns a new serviceInfo struct func newServiceInfo(serviceName proxy.ServicePortName, port *api.ServicePort, service *api.Service) *serviceInfo { - onlyNodeLocalEndpoints := apiservice.NeedsHealthCheck(service) && featuregate.DefaultFeatureGate.ExternalTrafficLocalOnly() && (service.Spec.Type == api.ServiceTypeLoadBalancer || service.Spec.Type == api.ServiceTypeNodePort) + onlyNodeLocalEndpoints := apiservice.NeedsHealthCheck(service) && utilflag.DefaultFeatureGate.ExternalTrafficLocalOnly() && (service.Spec.Type == api.ServiceTypeLoadBalancer || service.Spec.Type == api.ServiceTypeNodePort) info := &serviceInfo{ clusterIP: net.ParseIP(service.Spec.ClusterIP), port: int(port.Port), @@ -606,7 +606,7 @@ func (proxier *Proxier) OnEndpointsUpdate(allEndpoints []api.Endpoints) { var isLocalEndpoint bool if addr.NodeName != nil { isLocalEndpoint = *addr.NodeName == proxier.hostname - isLocalEndpoint = featuregate.DefaultFeatureGate.ExternalTrafficLocalOnly() && isLocalEndpoint + isLocalEndpoint = utilflag.DefaultFeatureGate.ExternalTrafficLocalOnly() && isLocalEndpoint } hostPortObject := hostPortInfo{ host: addr.IP, diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index ba32331423..fd73c04a49 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/pkg/registry/core/endpoint" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" - featuregate "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" ) // ServiceRest includes storage for services and all sub resources @@ -565,7 +565,7 @@ func shouldAssignNodePorts(service *api.Service) bool { func shouldCheckOrAssignHealthCheckNodePort(service *api.Service) bool { if service.Spec.Type == api.ServiceTypeLoadBalancer { // True if Service-type == LoadBalancer AND annotation AnnotationExternalTraffic present - return (featuregate.DefaultFeatureGate.ExternalTrafficLocalOnly() && apiservice.NeedsHealthCheck(service)) + return (utilflag.DefaultFeatureGate.ExternalTrafficLocalOnly() && apiservice.NeedsHealthCheck(service)) } glog.V(4).Infof("Service type: %v does not need health check node port", service.Spec.Type) return false diff --git a/pkg/registry/core/service/rest_test.go b/pkg/registry/core/service/rest_test.go index 580b2b28f9..ab7f2346a0 100644 --- a/pkg/registry/core/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -32,12 +32,12 @@ import ( "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/registrytest" - featuregate "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/intstr" ) func init() { - featuregate.DefaultFeatureGate.Set("AllowExtTrafficLocalEndpoints=true") + utilflag.DefaultFeatureGate.Set("AllowExtTrafficLocalEndpoints=true") } // TODO(wojtek-t): Cleanup this file. diff --git a/pkg/security/apparmor/validate.go b/pkg/security/apparmor/validate.go index deed85fcec..861853e8e3 100644 --- a/pkg/security/apparmor/validate.go +++ b/pkg/security/apparmor/validate.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util" - utilconfig "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" ) // Whether AppArmor should be disabled by default. @@ -95,7 +95,7 @@ func (v *validator) ValidateHost() error { // Verify that the host and runtime is capable of enforcing AppArmor profiles. func validateHost(runtime string) error { // Check feature-gates - if !utilconfig.DefaultFeatureGate.AppArmor() { + if !utilflag.DefaultFeatureGate.AppArmor() { return errors.New("AppArmor disabled by feature-gate") } diff --git a/pkg/util/config/configuration_map.go b/pkg/util/flag/configuration_map.go similarity index 98% rename from pkg/util/config/configuration_map.go rename to pkg/util/flag/configuration_map.go index 0acbde56f8..911b05ec6c 100644 --- a/pkg/util/config/configuration_map.go +++ b/pkg/util/flag/configuration_map.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package flag import ( "fmt" diff --git a/pkg/util/config/feature_gate.go b/pkg/util/flag/feature_gate.go similarity index 99% rename from pkg/util/config/feature_gate.go rename to pkg/util/flag/feature_gate.go index ea01833fbe..97427e4ee3 100644 --- a/pkg/util/config/feature_gate.go +++ b/pkg/util/flag/feature_gate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package flag import ( "fmt" diff --git a/pkg/util/config/feature_gate_test.go b/pkg/util/flag/feature_gate_test.go similarity index 99% rename from pkg/util/config/feature_gate_test.go rename to pkg/util/flag/feature_gate_test.go index 02b90b88f8..b1bd967f52 100644 --- a/pkg/util/config/feature_gate_test.go +++ b/pkg/util/flag/feature_gate_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package flag import ( "fmt" diff --git a/pkg/util/config/namedcertkey_flag.go b/pkg/util/flag/namedcertkey_flag.go similarity index 99% rename from pkg/util/config/namedcertkey_flag.go rename to pkg/util/flag/namedcertkey_flag.go index 39f20f681f..bc6867748b 100644 --- a/pkg/util/config/namedcertkey_flag.go +++ b/pkg/util/flag/namedcertkey_flag.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package flag import ( "errors" diff --git a/pkg/util/config/namedcertkey_flag_test.go b/pkg/util/flag/namedcertkey_flag_test.go similarity index 99% rename from pkg/util/config/namedcertkey_flag_test.go rename to pkg/util/flag/namedcertkey_flag_test.go index faddf03398..76df0e8682 100644 --- a/pkg/util/config/namedcertkey_flag_test.go +++ b/pkg/util/flag/namedcertkey_flag_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package flag import ( "fmt" diff --git a/plugin/cmd/kube-scheduler/app/options/options.go b/plugin/cmd/kube-scheduler/app/options/options.go index 840bed0c85..517d7978f8 100644 --- a/plugin/cmd/kube-scheduler/app/options/options.go +++ b/plugin/cmd/kube-scheduler/app/options/options.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" "k8s.io/kubernetes/pkg/client/leaderelection" - "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/plugin/pkg/scheduler/factory" "github.com/spf13/pflag" @@ -72,5 +72,5 @@ func (s *SchedulerServer) AddFlags(fs *pflag.FlagSet) { "to every RequiredDuringScheduling affinity rule. --hard-pod-affinity-symmetric-weight represents the weight of implicit PreferredDuringScheduling affinity rule.") fs.StringVar(&s.FailureDomains, "failure-domains", api.DefaultFailureDomains, "Indicate the \"all topologies\" set for an empty topologyKey when it's used for PreferredDuringScheduling pod anti-affinity.") leaderelection.BindFlags(&s.LeaderElection, fs) - config.DefaultFeatureGate.AddFlag(fs) + utilflag.DefaultFeatureGate.AddFlag(fs) } diff --git a/test/e2e_node/services/services.go b/test/e2e_node/services/services.go index ae7372185e..6ba40ef379 100644 --- a/test/e2e_node/services/services.go +++ b/test/e2e_node/services/services.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" "github.com/kardianos/osext" - utilconfig "k8s.io/kubernetes/pkg/util/config" + utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/test/e2e/framework" ) @@ -119,7 +119,7 @@ func (e *E2EServices) Stop() { func RunE2EServices() { // Populate global DefaultFeatureGate with value from TestContext.FeatureGates. // This way, statically-linked components see the same feature gate config as the test context. - utilconfig.DefaultFeatureGate.Set(framework.TestContext.FeatureGates) + utilflag.DefaultFeatureGate.Set(framework.TestContext.FeatureGates) e := newE2EServices() if err := e.run(); err != nil { glog.Fatalf("Failed to run e2e services: %v", err)