Merge pull request #159 from linkernetworks/phstsai/VX-207

[Task] VX-207: Improve go report (prometheus part)
linkernetworks · Jul 25, 2018 · 9cfcf07 · 9cfcf07
2 parents 8e6d031 + 09dc796
commit 9cfcf07
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -96,8 +96,8 @@ apps.init-helm:
 
 .PHONY: apps.launch-apps
 apps.launch-apps:
-	helm install --name vortex-foundation --debug --set global.environment=testing deploy/helm/foundation
-	helm install --name vortex-apps --debug --set global.environment=testing deploy/helm/apps/
+	helm install --name vortex-foundation --debug --wait --set global.environment=local deploy/helm/foundation
+	helm install --name vortex-apps --debug --wait --set global.environment=local deploy/helm/apps/
 
 .PHONY: apps.teardown
 apps.teardown:

diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -160,7 +160,6 @@ func generateInitContainer(networks []entity.PodNetwork) ([]corev1.Container, er
 func generateNetwork(session *mongo.Session, pod *entity.Pod) ([]string, []corev1.Container, error) {
 
 	networks := []entity.Network{}
-	containers := []corev1.Container{}
 	for i, v := range pod.Networks {
 		network := entity.Network{}
 		if err := session.FindOne(entity.NetworkCollectionName, bson.M{"name": v.Name}, &network); err != nil {

diff --git a/src/prometheuscontroller/query_test.go b/src/prometheuscontroller/query_test.go
@@ -48,7 +48,7 @@ func (suite *PrometheusQueryTestSuite) TestQuery() {
 	suite.NotEqual(0, float32(resource[0].Value))
 
 	// Get nil if the resource is empty
-	resource, err = query(suite.sp, "")
+	resource, _ = query(suite.sp, "")
 	suite.Equal(model.Vector(nil), resource)
 }
 
@@ -63,6 +63,6 @@ func (suite *PrometheusQueryTestSuite) TestGetElements() {
 	suite.NotEqual(0, float32(resource[0].Value))
 
 	// Get nil if the resource is empty
-	resource, err = getElements(suite.sp, Expression{})
+	resource, _ = getElements(suite.sp, Expression{})
 	suite.Equal(model.Vector(nil), resource)
 }
diff --git a/src/server/handler_prometheus.go b/src/server/handler_prometheus.go
@@ -55,8 +55,6 @@ func listContainerMetricsHandler(ctx *web.Context) {
 
 func getContainerMetricsHandler(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
-
-	container := entity.ContainerMetrics{}
 	id := req.PathParameter("id")
 
 	container, err := pc.GetContainer(sp, id)
@@ -116,8 +114,6 @@ func listPodMetricsHandler(ctx *web.Context) {
 
 func getPodMetricsHandler(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
-
-	pod := entity.PodMetrics{}
 	id := req.PathParameter("id")
 
 	pod, err := pc.GetPod(sp, id)
@@ -164,8 +160,6 @@ func listControllerMetricsHandler(ctx *web.Context) {
 
 func getControllerMetricsHandler(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
-
-	controller := entity.ControllerMetrics{}
 	id := req.PathParameter("id")
 
 	controller, err := pc.GetController(sp, id)
@@ -212,8 +206,6 @@ func listServiceMetricsHandler(ctx *web.Context) {
 
 func getServiceMetricsHandler(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
-
-	service := entity.ServiceMetrics{}
 	id := req.PathParameter("id")
 
 	service, err := pc.GetService(sp, id)
@@ -252,8 +244,6 @@ func listNodeMetricsHandler(ctx *web.Context) {
 
 func listNodeNicsMetricsHandler(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
-
-	nicList := entity.NodeNICsMetrics{}
 	id := req.PathParameter("id")
 
 	nicList, err := pc.ListNodeNICs(sp, id)
@@ -267,8 +257,6 @@ func listNodeNicsMetricsHandler(ctx *web.Context) {
 
 func getNodeMetricsHandler(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
-
-	node := entity.NodeMetrics{}
 	id := req.PathParameter("id")
 
 	node, err := pc.GetNode(sp, id)