From 343b1927d18edcf675e28ee52ab3ece2cd0d519e Mon Sep 17 00:00:00 2001 From: harry Date: Wed, 9 Mar 2016 15:43:02 +0800 Subject: [PATCH] Refactor config map into sub pkg --- cmd/kube-apiserver/app/options/options.go | 6 +++--- cmd/kubelet/app/options/options.go | 11 ++++++----- cmd/kubelet/app/server.go | 5 +++-- pkg/util/{ => config}/configuration_map.go | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) rename pkg/util/{ => config}/configuration_map.go (98%) diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 447f5bece6..5e8e435f04 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -32,7 +32,7 @@ import ( kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/config" utilnet "k8s.io/kubernetes/pkg/util/net" "github.com/spf13/pflag" @@ -74,7 +74,7 @@ type APIServer struct { OIDCIssuerURL string OIDCUsernameClaim string OIDCGroupsClaim string - RuntimeConfig util.ConfigurationMap + RuntimeConfig config.ConfigurationMap SSHKeyfile string SSHUser string ServiceAccountKeyFile string @@ -106,7 +106,7 @@ func NewAPIServer() *APIServer { EventTTL: 1 * time.Hour, MasterCount: 1, MasterServiceNamespace: api.NamespaceDefault, - RuntimeConfig: make(util.ConfigurationMap), + RuntimeConfig: make(config.ConfigurationMap), StorageVersions: registered.AllPreferredGroupVersions(), DefaultStorageVersions: registered.AllPreferredGroupVersions(), KubeletConfig: kubeletclient.KubeletClientConfig{ diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index e58706f734..81bc772bc8 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -28,6 +28,7 @@ import ( kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/config" "github.com/spf13/pflag" ) @@ -52,8 +53,8 @@ type KubeletServer struct { ChaosChance float64 // Crash immediately, rather than eating panics. ReallyCrashForTesting bool - SystemReserved util.ConfigurationMap - KubeReserved util.ConfigurationMap + SystemReserved config.ConfigurationMap + KubeReserved config.ConfigurationMap } // NewKubeletServer will create a new KubeletServer with default values. @@ -62,8 +63,8 @@ func NewKubeletServer() *KubeletServer { AuthPath: util.NewStringFlag("/var/lib/kubelet/kubernetes_auth"), // deprecated KubeConfig: util.NewStringFlag("/var/lib/kubelet/kubeconfig"), - SystemReserved: make(util.ConfigurationMap), - KubeReserved: make(util.ConfigurationMap), + SystemReserved: make(config.ConfigurationMap), + KubeReserved: make(config.ConfigurationMap), KubeletConfiguration: componentconfig.KubeletConfiguration{ Address: "0.0.0.0", CAdvisorPort: 4194, @@ -181,7 +182,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.ClusterDNS, "cluster-dns", s.ClusterDNS, "IP address for a cluster DNS server. If set, kubelet will configure all containers to use this for DNS resolution in addition to the host's DNS servers") 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") - bindableNodeLabels := util.ConfigurationMap(s.NodeLabels) + bindableNodeLabels := config.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 a unused image before it is garbage collected. Examples: '300ms', '10s' or '2h45m'. Default: '2m'") fs.IntVar(&s.ImageGCHighThresholdPercent, "image-gc-high-threshold", s.ImageGCHighThresholdPercent, "The percent of disk usage after which image garbage collection is always run. Default: 90%") diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 19bb96049f..6fe07c61d0 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -59,6 +59,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/server" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util" + utilconfig "k8s.io/kubernetes/pkg/util/config" "k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/flock" "k8s.io/kubernetes/pkg/util/io" @@ -875,7 +876,7 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod return k, pc, nil } -func parseReservation(kubeReserved, systemReserved util.ConfigurationMap) (*kubetypes.Reservation, error) { +func parseReservation(kubeReserved, systemReserved utilconfig.ConfigurationMap) (*kubetypes.Reservation, error) { reservation := new(kubetypes.Reservation) if rl, err := parseResourceList(kubeReserved); err != nil { return nil, err @@ -890,7 +891,7 @@ func parseReservation(kubeReserved, systemReserved util.ConfigurationMap) (*kube return reservation, nil } -func parseResourceList(m util.ConfigurationMap) (api.ResourceList, error) { +func parseResourceList(m utilconfig.ConfigurationMap) (api.ResourceList, error) { rl := make(api.ResourceList) for k, v := range m { switch api.ResourceName(k) { diff --git a/pkg/util/configuration_map.go b/pkg/util/config/configuration_map.go similarity index 98% rename from pkg/util/configuration_map.go rename to pkg/util/config/configuration_map.go index cf2b326a90..e7ad4fadb3 100644 --- a/pkg/util/configuration_map.go +++ b/pkg/util/config/configuration_map.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package util +package config import ( "fmt"