Merge branch 'master' into server-counter-e2e

Author: carreter

e2e/README.md

@@ -0,0 +1,23 @@
+# End-to-end tests for konnectivity-network-proxy running in a kind cluster
+
+These e2e tests deploy the KNP agent and server to a local [kind](https://kind.sigs.k8s.io/)
+cluster to verify their functionality.
+
+These can be run automatically using `make e2e-test`.
+
+## Setup in `main_test.go`
+
+Before any of the actual tests are run, the `TestMain()` function
+in `main_test.go` performs the following set up steps:
+
+- Spin up a new kind cluster with the node image provided by the `-kind-image` flag.
+- Sideload the KNP agent and server images provided with `-agent-image` and `-server-image` into the cluster.
+- Deploy the necessary RBAC and service templates for both the KNP agent and server (see `renderAndApplyManifests`).
+
+## The tests
+
+### `static_count_test.go`
+
+These tests deploy the KNP servers and agents to the previously created kind cluster.
+After the deployments are up, the tests check that both the agent and server report
+the correct number of connections on their metrics endpoints.

e2e/metrics_assertions_test.go

@@ -35,10 +35,10 @@ func getMetricsGaugeValue(restCfg *rest.Config, namespace string, podName string
 
 	metricsParser := &expfmt.TextParser{}
 	metricsFamilies, err := metricsParser.TextToMetricFamilies(resp.Body)
-	defer resp.Body.Close()
 	if err != nil {
 		return 0, fmt.Errorf("could not parse metrics: %w", err)
 	}
+	defer resp.Body.Close()
 
 	metricFamily, exists := metricsFamilies[metricName]
 	if !exists {
@@ -56,7 +56,7 @@ func assertAgentsAreConnected(expectedConnections int) func(context.Context, *te
 		agentPods := &corev1.PodList{}
 		err := client.Resources().List(ctx, agentPods, resources.WithLabelSelector("k8s-app=konnectivity-agent"))
 		if err != nil {
-			t.Fatalf("couldn't get agent pods: %v", err)
+			t.Fatalf("couldn't get agent pods (label selector 'k8s-app=konnectivity-agent'): %v", err)
 		}
 
 		for _, agentPod := range agentPods.Items {
@@ -66,7 +66,7 @@ func assertAgentsAreConnected(expectedConnections int) func(context.Context, *te
 			}
 
 			if numConnections != expectedConnections {
-				t.Errorf("incorrect number of connected servers (want: %v, got: %v)", expectedConnections, numConnections)
+				t.Errorf("incorrect number of connected servers (want: %d, got: %d)", expectedConnections, numConnections)
 			}
 		}
 
@@ -81,7 +81,7 @@ func assertServersAreConnected(expectedConnections int) func(context.Context, *t
 		serverPods := &corev1.PodList{}
 		err := client.Resources().List(ctx, serverPods, resources.WithLabelSelector("k8s-app=konnectivity-server"))
 		if err != nil {
-			t.Fatalf("couldn't get server pods: %v", err)
+			t.Fatalf("couldn't get server pods (label selector 'k8s-app=konnectivity-server'): %v", err)
 		}
 
 		for _, serverPod := range serverPods.Items {
@@ -91,7 +91,7 @@ func assertServersAreConnected(expectedConnections int) func(context.Context, *t
 			}
 
 			if numConnections != expectedConnections {
-				t.Errorf("incorrect number of connected agents (want: %v, got: %v)", expectedConnections, numConnections)
+				t.Errorf("incorrect number of connected agents (want: %d, got: %d)", expectedConnections, numConnections)
 			}
 		}