Merge pull request #1720 from fate-grand-order/master

correct misspelling "Separator"

Author: piosz

metrics/heapster.go

@@ -67,7 +67,7 @@ func main() {
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
-	setLabelSeperator(opt)
+	setLabelSeparator(opt)
 	setMaxProcs(opt)
 	glog.Infof(strings.Join(os.Args, " "))
 	glog.Infof("Heapster version %v", version.HeapsterVersion)
@@ -354,6 +354,6 @@ func setMaxProcs(opt *options.HeapsterRunOptions) {
 	}
 }
 
-func setLabelSeperator(opt *options.HeapsterRunOptions) {
-	util.SetLabelSeperator(opt.LabelSeperator)
+func setLabelSeparator(opt *options.HeapsterRunOptions) {
+	util.SetLabelSeparator(opt.LabelSeparator)
 }

metrics/options/options.go

@@ -46,7 +46,7 @@ type HeapsterRunOptions struct {
 	Sinks               flags.Uris
 	HistoricalSource    string
 	Version             bool
-	LabelSeperator      string
+	LabelSeparator      string
 	DisableMetricExport bool
 }
 
@@ -82,6 +82,6 @@ func (h *HeapsterRunOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&h.AllowedUsers, "allowed_users", "", "comma-separated list of allowed users")
 	fs.StringVar(&h.HistoricalSource, "historical_source", "", "which source type to use for the historical API (should be exactly the same as one of the sink URIs), or empty to disable the historical API")
 	fs.BoolVar(&h.Version, "version", false, "print version info and exit")
-	fs.StringVar(&h.LabelSeperator, "label_seperator", ",", "seperator used for joining labels")
+	fs.StringVar(&h.LabelSeparator, "label_separator", ",", "separator used for joining labels")
 	fs.BoolVar(&h.DisableMetricExport, "disable_export", false, "Disable exporting metrics in api/v1/metric-export")
 }

metrics/util/util.go

@@ -26,9 +26,9 @@ import (
 	"time"
 )
 
-var labelSeperator string
+var labelSeparator string
 
-// Concatenates a map of labels into a Seperator-seperated key:value pairs.
+// Concatenates a map of labels into a Separator-separated key:value pairs.
 func LabelsToString(labels map[string]string) string {
 	output := make([]string, 0, len(labels))
 	for key, value := range labels {
@@ -37,11 +37,11 @@ func LabelsToString(labels map[string]string) string {
 
 	// Sort to produce a stable output.
 	sort.Strings(output)
-	return strings.Join(output, labelSeperator)
+	return strings.Join(output, labelSeparator)
 }
 
-func SetLabelSeperator(seperator string) {
-	labelSeperator = seperator
+func SetLabelSeparator(separator string) {
+	labelSeparator = separator
 }
 
 func GetNodeLister(kubeClient *kube_client.Clientset) (v1listers.NodeLister, *cache.Reflector, error) {