706 update e2e process stats tests (#707)

#706

- Adds metrics-server to kind deployment script
- Pins kpack ClusterStore node buildpack version to previous working one
- Adds an e2e test for the GET process_stats endpoint when metrics server is present

Co-authored-by: Ashwin Krishna <krishnaas@vmware.com>

api/repositories/pod_repository.go

@@ -120,29 +120,31 @@ func (r *PodRepo) ListPodStats(ctx context.Context, authInfo authorization.Info,
 
 		podMetrics, err := r.metricsFetcher(ctx, p.Namespace, p.Name)
 		if err != nil {
-			if !strings.Contains(err.Error(), "the server could not find the requested resource") {
-				return nil, err
+			errorMsg := err.Error()
+			if strings.Contains(errorMsg, "not found") ||
+				strings.Contains(errorMsg, "the server could not find the requested resource") {
+				continue
 			}
-			continue
+			return nil, err
 		}
 		metricsMap := aggregateContainerMetrics(podMetrics.Containers)
 		if len(metricsMap) == 0 {
 			continue
 		}
 
-		if quantity, ok := metricsMap["cpu"]; ok {
-			value := float64(quantity.ScaledValue(resource.Nano))
+		if CPUquantity, ok := metricsMap["cpu"]; ok {
+			value := float64(CPUquantity.ScaledValue(resource.Nano))
 			percentage := value / 1e7
 			records[index].Usage.CPU = &percentage
 		}
 
-		if r2, ok := metricsMap["memory"]; ok {
-			value := r2.Value()
+		if memQuantity, ok := metricsMap["memory"]; ok {
+			value := memQuantity.Value()
 			records[index].Usage.Mem = &value
 		}
 
-		if r3, ok := metricsMap["storage"]; ok {
-			value := r3.Value()
+		if storageQuantity, ok := metricsMap["storage"]; ok {
+			value := storageQuantity.Value()
 			records[index].Usage.Disk = &value
 		}
 		time := podMetrics.Timestamp.UTC().Format(TimestampFormat)
@@ -297,7 +299,6 @@ func containersRunning(statuses []corev1.ContainerStatus) bool {
 	return true
 }
 
-// Untested
 func CreateMetricsFetcher() (MetricsFetcherFn, error) {
 	restConfig, err := rest.InClusterConfig()
 	if err != nil {

api/repositories/pod_repository_test.go

@@ -279,6 +279,22 @@ var _ = Describe("PodRepository", func() {
 				})
 			})
 
+			When("MetricsFetcherFunction returns a not found error for the PodMetrics", func() {
+				BeforeEach(func() {
+					message.Instances = 2
+					metricFetcherFn.Returns(nil, errors.New("podmetrics.metrics.k8s.io \\\"Blah\\\" not found"))
+				})
+				It("fetches all the pods and sets the usage stats with empty values", func() {
+					Expect(listStatsErr).NotTo(HaveOccurred())
+					Expect(records).To(ConsistOf(
+						[]PodStatsRecord{
+							{Type: "web", Index: 0, State: "RUNNING"},
+							{Type: "web", Index: 1, State: "DOWN"},
+						},
+					))
+				})
+			})
+
 			When("MetricFetcherFunction return some other error", func() {
 				BeforeEach(func() {
 					message.Instances = 2

api/tests/e2e/e2e_suite_test.go

@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/cf-k8s-controllers/api/apis"
+	"code.cloudfoundry.org/cf-k8s-controllers/api/presenter"
 	"code.cloudfoundry.org/cf-k8s-controllers/api/tests/e2e/helpers"
 
 	"github.com/go-resty/resty/v2"
@@ -93,12 +94,7 @@ type dropletResource struct {
 }
 
 type statsResourceList struct {
-	Resources []statsResource `json:"resources"`
-}
-
-type statsResource struct {
-	Type  string `json:"type"`
-	State string `json:"state"`
+	Resources []presenter.ProcessStatsResource `json:"resources"`
 }
 
 type manifestResource struct {

api/tests/e2e/processes_test.go

@@ -1,12 +1,16 @@
 package e2e_test
 
 import (
+	"fmt"
 	"net/http"
+	"time"
+
+	"code.cloudfoundry.org/cf-k8s-controllers/api/presenter"
 
 	"github.com/go-resty/resty/v2"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
+	. "github.com/onsi/gomega/gstruct"
 	rbacv1 "k8s.io/api/rbac/v1"
 )
 
@@ -16,13 +20,13 @@ var _ = Describe("Processes", func() {
 		spaceGUID   string
 		appGUID     string
 		processGUID string
-		client      *resty.Client
+		restyClient *resty.Client
 		resp        *resty.Response
 		errResp     cfErrs
 	)
 
 	BeforeEach(func() {
-		client = certClient
+		restyClient = certClient
 		errResp = cfErrs{}
 		orgGUID = createOrg(generateGUID("org"))
 		createOrgRole("organization_user", rbacv1.UserKind, certUserName, orgGUID)
@@ -37,11 +41,6 @@ var _ = Describe("Processes", func() {
 		deleteOrg(orgGUID)
 	})
 
-	BeforeEach(func() {
-		appGUID = pushNodeApp(spaceGUID)
-		processGUID = getProcess(appGUID, "web")
-	})
-
 	Describe("listing sidecars", Ordered, func() {
 		var list resourceList
 
@@ -51,7 +50,7 @@ var _ = Describe("Processes", func() {
 
 		JustBeforeEach(func() {
 			var err error
-			resp, err = client.R().
+			resp, err = restyClient.R().
 				SetResult(&list).
 				SetError(&errResp).
 				Get("/v3/processes/" + processGUID + "/sidecars")
@@ -66,7 +65,7 @@ var _ = Describe("Processes", func() {
 
 		When("the user is not authorized in the space", func() {
 			BeforeEach(func() {
-				client = tokenClient
+				restyClient = tokenClient
 			})
 
 			It("returns a not found error", func() {
@@ -85,15 +84,9 @@ var _ = Describe("Processes", func() {
 	Describe("getting process stats", func() {
 		var processStats statsResourceList
 
-		BeforeEach(func() {
-			appGUID = pushNodeApp(spaceGUID)
-			processGUID = getProcess(appGUID, "web")
-			processStats = statsResourceList{}
-		})
-
 		JustBeforeEach(func() {
 			var err error
-			resp, err = client.R().
+			resp, err = restyClient.R().
 				SetResult(&processStats).
 				SetError(&errResp).
 				Get("/v3/processes/" + processGUID + "/stats")
@@ -109,9 +102,38 @@ var _ = Describe("Processes", func() {
 			Expect(processStats.Resources[0].Type).To(Equal("web"))
 		})
 
+		When("we wait for the metrics to be ready", func() {
+			BeforeEach(func() {
+				// use an eventually to check when the pod metrics become available
+				Eventually(func() presenter.ProcessUsage {
+					var err error
+					resp, err = restyClient.R().
+						SetResult(&processStats).
+						SetError(&errResp).
+						Get("/v3/processes/" + processGUID + "/stats")
+					Expect(err).NotTo(HaveOccurred())
+
+					return processStats.Resources[0].Usage
+				}, 60*time.Second).ShouldNot(Equal(presenter.ProcessUsage{}))
+			})
+			It("succeeds", func() {
+				Expect(resp).To(HaveRestyStatusCode(http.StatusOK))
+
+				fmt.Printf("\nWAIT RESPONSE\n\n%#v\n\n\n", resp)
+				fmt.Printf("\nWAIT PROCESS STATS\n\n%#v\n\n\n", processStats)
+				Expect(processStats.Resources).To(HaveLen(1))
+				Expect(processStats.Resources[0].Usage).To(MatchFields(IgnoreExtras, Fields{
+					"Mem":  Not(BeNil()),
+					"CPU":  Not(BeNil()),
+					"Time": Not(BeNil()),
+					//"Disk": Not(BeNil()), // Disk is currently empty
+				}))
+			})
+		})
+
 		When("the user is not authorized in the space", func() {
 			BeforeEach(func() {
-				client = tokenClient
+				restyClient = tokenClient
 			})
 
 			It("returns a not found error", func() {
@@ -132,7 +154,7 @@ var _ = Describe("Processes", func() {
 
 		JustBeforeEach(func() {
 			var err error
-			resp, err = client.R().
+			resp, err = restyClient.R().
 				SetResult(&result).
 				Get("/v3/processes/" + processGUID)
 			Expect(err).NotTo(HaveOccurred())

dependencies/kpack/cluster_store.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   sources:
   - image: gcr.io/paketo-buildpacks/java
-  - image: gcr.io/paketo-buildpacks/nodejs
+  - image: gcr.io/paketo-buildpacks/nodejs:0.13
   - image: gcr.io/paketo-buildpacks/ruby
   - image: gcr.io/paketo-buildpacks/procfile
   - image: gcr.io/paketo-buildpacks/go