fix some err

apache · Nov 17, 2021 · 60cd7b0 · 60cd7b0
1 parent 11e39a3
commit 60cd7b0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/pkg/ingress/pod_test.go b/pkg/ingress/pod_test.go
@@ -34,7 +34,7 @@ func TestPodOnAdd(t *testing.T) {
 		controller: &Controller{
 			watchingNamespace: watchingNamespace,
 			podCache:          types.NewPodCache(),
-			MetricsCollector: metrics.NewPrometheusCollector(),
+			MetricsCollector:  metrics.NewPrometheusCollector(),
 		},
 	}
 
@@ -76,7 +76,7 @@ func TestPodOnDelete(t *testing.T) {
 		controller: &Controller{
 			watchingNamespace: watchingNamespace,
 			podCache:          types.NewPodCache(),
-			MetricsCollector: metrics.NewPrometheusCollector(),
+			MetricsCollector:  metrics.NewPrometheusCollector(),
 		},
 	}
 
@@ -121,7 +121,7 @@ func TestPodOnUpdate(t *testing.T) {
 		controller: &Controller{
 			watchingNamespace: watchingNamespace,
 			podCache:          types.NewPodCache(),
-			MetricsCollector: metrics.NewPrometheusCollector(),
+			MetricsCollector:  metrics.NewPrometheusCollector(),
 		},
 	}
 

diff --git a/pkg/metrics/prometheus.go b/pkg/metrics/prometheus.go
@@ -64,7 +64,7 @@ type collector struct {
 	controllerEvents   *prometheus.CounterVec
 }
 
-// NewPrometheusCollectors creates the Prometheus metrics collector.
+// NewPrometheusCollector creates the Prometheus metrics collector.
 // It also registers all internal metric collector to prometheus,
 // so do not call this function duplicately.
 func NewPrometheusCollector() Collector {
@@ -222,7 +222,7 @@ func (c *collector) IncrSyncOperation(resource, result string) {
 	}).Inc()
 }
 
-// IncrCacheSync increases the number of cache sync operations for
+// IncrCacheSyncOperation increases the number of cache sync operations for
 // cluster.
 func (c *collector) IncrCacheSyncOperation(result string) {
 	c.cacheSyncOperation.WithLabelValues(result).Inc()

diff --git a/test/e2e/scaffold/k8s.go b/test/e2e/scaffold/k8s.go
@@ -17,8 +17,8 @@ package scaffold
 import (
 	"context"
 	"encoding/json"
-	"github.com/apache/apisix-ingress-controller/pkg/metrics"
 	"fmt"
+	"github.com/apache/apisix-ingress-controller/pkg/metrics"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -276,8 +276,9 @@ func (s *Scaffold) ListApisixUpstreams() ([]*v1.Upstream, error) {
 		return nil, err
 	}
 	err = cli.AddCluster(context.Background(), &apisix.ClusterOptions{
-		BaseURL:  u.String(),
-		AdminKey: s.opts.APISIXAdminAPIKey,
+		BaseURL:          u.String(),
+		AdminKey:         s.opts.APISIXAdminAPIKey,
+		MetricsCollector: metrics.NewPrometheusCollector(),
 	})
 	if err != nil {
 		return nil, err
@@ -297,8 +298,9 @@ func (s *Scaffold) ListApisixGlobalRules() ([]*v1.GlobalRule, error) {
 		return nil, err
 	}
 	err = cli.AddCluster(context.Background(), &apisix.ClusterOptions{
-		BaseURL:  u.String(),
-		AdminKey: s.opts.APISIXAdminAPIKey,
+		BaseURL:          u.String(),
+		AdminKey:         s.opts.APISIXAdminAPIKey,
+		MetricsCollector: metrics.NewPrometheusCollector(),
 	})
 	if err != nil {
 		return nil, err
@@ -318,8 +320,8 @@ func (s *Scaffold) ListApisixRoutes() ([]*v1.Route, error) {
 		return nil, err
 	}
 	err = cli.AddCluster(context.Background(), &apisix.ClusterOptions{
-		BaseURL:  u.String(),
-		AdminKey: s.opts.APISIXAdminAPIKey,
+		BaseURL:          u.String(),
+		AdminKey:         s.opts.APISIXAdminAPIKey,
 		MetricsCollector: metrics.NewPrometheusCollector(),
 	})
 	if err != nil {
@@ -340,8 +342,8 @@ func (s *Scaffold) ListApisixConsumers() ([]*v1.Consumer, error) {
 		return nil, err
 	}
 	err = cli.AddCluster(context.Background(), &apisix.ClusterOptions{
-		BaseURL:  u.String(),
-		AdminKey: s.opts.APISIXAdminAPIKey,
+		BaseURL:          u.String(),
+		AdminKey:         s.opts.APISIXAdminAPIKey,
 		MetricsCollector: metrics.NewPrometheusCollector(),
 	})
 	if err != nil {
@@ -362,8 +364,8 @@ func (s *Scaffold) ListApisixStreamRoutes() ([]*v1.StreamRoute, error) {
 		return nil, err
 	}
 	err = cli.AddCluster(context.Background(), &apisix.ClusterOptions{
-		BaseURL:  u.String(),
-		AdminKey: s.opts.APISIXAdminAPIKey,
+		BaseURL:          u.String(),
+		AdminKey:         s.opts.APISIXAdminAPIKey,
 		MetricsCollector: metrics.NewPrometheusCollector(),
 	})
 	if err != nil {
@@ -384,8 +386,8 @@ func (s *Scaffold) ListApisixSsl() ([]*v1.Ssl, error) {
 		return nil, err
 	}
 	err = cli.AddCluster(context.Background(), &apisix.ClusterOptions{
-		BaseURL:  u.String(),
-		AdminKey: s.opts.APISIXAdminAPIKey,
+		BaseURL:          u.String(),
+		AdminKey:         s.opts.APISIXAdminAPIKey,
 		MetricsCollector: metrics.NewPrometheusCollector(),
 	})
 	if err != nil {