Switch out StatefulSet for Deployment

Author: carreter

e2e/lease_count_test.go

@@ -88,7 +88,7 @@ type KeyValue struct {
 	Value string
 }
 
-type StatefulSetConfig struct {
+type DeploymentConfig struct {
 	Replicas int
 	Image    string
 	Args     []KeyValue
@@ -156,21 +156,21 @@ func renderAndApplyManifests(ctx context.Context, cfg *envconf.Config) (context.
 	return ctx, nil
 }
 
-func deployAndWaitForStatefulSet(statefulSet client.Object) func(context.Context, *testing.T, *envconf.Config) context.Context {
+func deployAndWaitForDeployment(deployment client.Object) func(context.Context, *testing.T, *envconf.Config) context.Context {
 	return func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
 		client := cfg.Client()
-		err := client.Resources().Create(ctx, statefulSet)
+		err := client.Resources().Create(ctx, deployment)
 		if err != nil {
-			t.Fatalf("could not create StatefulSet: %v", err)
+			t.Fatalf("could not create Deployment: %v", err)
 		}
 
 		err = wait.For(
-			conditions.New(client.Resources()).DeploymentAvailable(statefulSet.GetName(), statefulSet.GetNamespace()),
+			conditions.New(client.Resources()).DeploymentAvailable(deployment.GetName(), deployment.GetNamespace()),
 			wait.WithTimeout(1*time.Minute),
 			wait.WithInterval(10*time.Second),
 		)
 		if err != nil {
-			t.Fatalf("waiting for StatefulSet deployment failed: %v", err)
+			t.Fatalf("waiting for Deployment failed: %v", err)
 		}
 
 		return ctx

e2e/main_test.go

@@ -34,7 +34,7 @@ func getMetricsGaugeValue(url string, name string) (int, error) {
 	return value, nil
 }
 
-func assertAgentsAreConnected(expectedConnections int, serviceHost string, adminPort int) func(context.Context, *testing.T, *envconf.Config) context.Context {
+func assertAgentsAreConnected(expectedConnections int, adminPort int) func(context.Context, *testing.T, *envconf.Config) context.Context {
 	return func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
 		client := cfg.Client()
 
@@ -45,7 +45,7 @@ func assertAgentsAreConnected(expectedConnections int, serviceHost string, admin
 		}
 
 		for _, agentPod := range agentPods.Items {
-			numConnections, err := getMetricsGaugeValue(fmt.Sprintf("%v-%v:%v/metrics", agentPod.Name, serviceHost, adminPort), "konnectivity_network_proxy_agent_open_server_connections")
+			numConnections, err := getMetricsGaugeValue(fmt.Sprintf("%v:%v/metrics", agentPod.Status.PodIP, adminPort), "konnectivity_network_proxy_agent_open_server_connections")
 			if err != nil {
 				t.Fatalf("couldn't get agent metric 'konnectivity_network_proxy_agent_open_server_connections' for pod %v", agentPod.Name)
 			}
@@ -59,7 +59,7 @@ func assertAgentsAreConnected(expectedConnections int, serviceHost string, admin
 	}
 }
 
-func assertServersAreConnected(expectedConnections int, serviceHost string, adminPort int) func(context.Context, *testing.T, *envconf.Config) context.Context {
+func assertServersAreConnected(expectedConnections int, adminPort int) func(context.Context, *testing.T, *envconf.Config) context.Context {
 	return func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
 		client := cfg.Client()
 
@@ -70,7 +70,7 @@ func assertServersAreConnected(expectedConnections int, serviceHost string, admi
 		}
 
 		for _, serverPod := range serverPods.Items {
-			numConnections, err := getMetricsGaugeValue(fmt.Sprintf("%v-%v:%v/metrics", serverPod.Name, serviceHost, adminPort), "konnectivity_network_proxy_server_ready_backend_connections")
+			numConnections, err := getMetricsGaugeValue(fmt.Sprintf("%v:%v/metrics", serverPod.Status.PodIP, adminPort), "konnectivity_network_proxy_server_ready_backend_connections")
 			if err != nil {
 				t.Fatalf("couldn't get agent metric 'konnectivity_network_proxy_server_ready_backend_connections' for pod %v", serverPod.Name)
 			}
@@ -83,28 +83,3 @@ func assertServersAreConnected(expectedConnections int, serviceHost string, admi
 		return ctx
 	}
 }
-
-func assertAgentKnownServerCount(expectedServerCount int, serviceHost string, adminPort int) func(context.Context, *testing.T, *envconf.Config) context.Context {
-	return func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
-		client := cfg.Client()
-
-		var agentPods *corev1.PodList
-		err := client.Resources().List(ctx, agentPods, resources.WithLabelSelector("k8s-app=konnectivity-agent"))
-		if err != nil {
-			t.Fatalf("couldn't get server pods: %v", err)
-		}
-
-		for _, agentPod := range agentPods.Items {
-			knownServerCount, err := getMetricsGaugeValue(fmt.Sprintf("%v-%v:%v/metrics", agentPod.Name, serviceHost, adminPort), "konnectivity_network_proxy_agent_known_server_count")
-			if err != nil {
-				t.Fatalf("couldn't get agent metric 'konnectivity_network_proxy_agent_known_server_count' for pod %v", agentPod.Name)
-			}
-
-			if knownServerCount != expectedServerCount {
-				t.Errorf("incorrect known server count (want: %v, got: %v)", knownServerCount, expectedServerCount)
-			}
-		}
-
-		return ctx
-	}
-}