removed an extra create pod function I added

hashicorp · Sep 21, 2023 · 1276430 · 1276430
1 parent 97b4432
commit 1276430
Showing 1 changed file with 1 addition and 84 deletions.
diff --git a/control-plane/connect-inject/controllers/pod/pod_controller_test.go b/control-plane/connect-inject/controllers/pod/pod_controller_test.go
@@ -22,6 +22,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/anypb"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -2039,90 +2040,6 @@ func addProbesAndOriginalPodAnnotation(pod *corev1.Pod) {
 	pod.Spec.Containers[0].StartupProbe.HTTPGet.Port = intstr.FromInt(20500)
 }
 
-// createPod creates a multi-port pod as a base for tests.
-func createPod(name, ip string, identity string, inject bool, ready bool) *corev1.Pod {
-	pod := &corev1.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: metav1.NamespaceDefault,
-			Labels:    map[string]string{},
-			Annotations: map[string]string{
-				constants.AnnotationConsulK8sVersion: "1.3.0",
-			},
-		},
-		Status: corev1.PodStatus{
-			PodIP:  ip,
-			HostIP: common.ConsulNodeAddress,
-		},
-		Spec: corev1.PodSpec{
-			Containers: []corev1.Container{
-				{
-					Name: "web",
-					Ports: []corev1.ContainerPort{
-						{
-							Name:          "public",
-							Protocol:      corev1.ProtocolTCP,
-							ContainerPort: 80,
-						},
-						{
-							Name:          "admin",
-							Protocol:      corev1.ProtocolTCP,
-							ContainerPort: 8080,
-						},
-					},
-					ReadinessProbe: &corev1.Probe{
-						ProbeHandler: corev1.ProbeHandler{
-							HTTPGet: &corev1.HTTPGetAction{
-								Path: "/readyz",
-								Port: intstr.FromInt(2000),
-							},
-						},
-					},
-					LivenessProbe: &corev1.Probe{
-						ProbeHandler: corev1.ProbeHandler{
-							HTTPGet: &corev1.HTTPGetAction{
-								Path: "/livez",
-								Port: intstr.FromInt(2001),
-							},
-						},
-					},
-					StartupProbe: &corev1.Probe{
-						ProbeHandler: corev1.ProbeHandler{
-							HTTPGet: &corev1.HTTPGetAction{
-								Path: "/startupz",
-								Port: intstr.FromInt(2002),
-							},
-						},
-					},
-				},
-			},
-			NodeName:           nodeName,
-			ServiceAccountName: identity,
-		},
-	}
-	if ready {
-		pod.Status.Conditions = []corev1.PodCondition{
-			{
-				Type:   corev1.PodReady,
-				Status: corev1.ConditionTrue,
-			},
-		}
-	} else {
-		pod.Status.Conditions = []corev1.PodCondition{
-			{
-				Type:   corev1.PodReady,
-				Status: corev1.ConditionFalse,
-			},
-		}
-	}
-
-	if inject {
-		pod.Labels[constants.KeyMeshInjectStatus] = constants.Injected
-		pod.Annotations[constants.KeyMeshInjectStatus] = constants.Injected
-	}
-	return pod
-}
-
 func requireEqualResourceID(t *testing.T, expected, actual *pbresource.ID) {
 	opts := []cmp.Option{
 		protocmp.IgnoreFields(&pbresource.ID{}, "uid"),