Fix integration tests by ensuring necessary pods are created

test/integration/controllers/etcd/reconciler_test.go

@@ -120,6 +120,11 @@ var _ = Describe("Etcd Controller", func() {
 
 			testutils.SetStatefulSetPodsUpdated(sts)
 			testutils.SetStatefulSetReady(sts)
+			testutils.CreateStsPods(ctx, k8sClient, sts)
+			DeferCleanup(func() {
+				testutils.DeleteStsPods(ctx, k8sClient, sts)
+			})
+
 			err = k8sClient.Status().Update(ctx, sts)
 			Expect(err).NotTo(HaveOccurred())
 

test/utils/misc.go

@@ -15,11 +15,12 @@
 package utils
 
 import (
+	"os"
+
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 	gomegatypes "github.com/onsi/gomega/types"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"os"
 )
 
 func MatchFinalizer(finalizer string) gomegatypes.GomegaMatcher {
@@ -58,3 +59,28 @@ func SwitchDirectory(path string) func() {
 		}
 	}
 }
+
+// mergeStringMaps merges the content of the newMaps with the oldMap. If a key already exists then
+// it gets overwritten by the last value with the same key.
+func mergeStringMaps(oldMap map[string]string, newMaps ...map[string]string) map[string]string {
+	var out map[string]string
+
+	if oldMap != nil {
+		out = make(map[string]string)
+	}
+	for k, v := range oldMap {
+		out[k] = v
+	}
+
+	for _, newMap := range newMaps {
+		if newMap != nil && out == nil {
+			out = make(map[string]string)
+		}
+
+		for k, v := range newMap {
+			out[k] = v
+		}
+	}
+
+	return out
+}

test/utils/statefulset.go

@@ -17,8 +17,10 @@ package utils
 import (
 	"context"
 	"fmt"
+	"strconv"
 
 	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
+	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -128,3 +130,65 @@ func CreateStatefulSet(name, namespace string, etcdUID types.UID, replicas int32
 		},
 	}
 }
+
+func CreateStsPods(ctx context.Context, cl client.Client, sts *appsv1.StatefulSet) {
+	stsReplicas := *sts.Spec.Replicas
+	for i := 0; i < int(stsReplicas); i++ {
+		podName := fmt.Sprintf("%s-%d", sts.Name, i)
+
+		podLabels := mergeStringMaps(sts.Spec.Template.Labels, map[string]string{
+			"apps.kubernetes.io/pod-index":       strconv.Itoa(i),
+			"statefulset.kubernetes.io/pod-name": podName,
+			"controller-revision-hash":           sts.Status.UpdateRevision,
+		})
+
+		pod := &corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      podName,
+				Namespace: sts.Namespace,
+				Labels:    podLabels,
+				OwnerReferences: []metav1.OwnerReference{
+					{
+						APIVersion:         appsv1.SchemeGroupVersion.Version,
+						Kind:               "StatefulSet",
+						BlockOwnerDeletion: pointer.Bool(true),
+						Name:               sts.Name,
+						UID:                sts.UID,
+					},
+				},
+			},
+			Spec: corev1.PodSpec{
+				Containers: []corev1.Container{
+					{
+						Name:  "etcd",
+						Image: "etcd-wrapper:latest",
+					},
+				},
+			},
+		}
+
+		ExpectWithOffset(1, cl.Create(ctx, pod)).To(Succeed())
+		// Update pod status and set ready condition to true
+		pod.Status.Conditions = []corev1.PodCondition{
+			{
+				Type:   corev1.PodReady,
+				Status: corev1.ConditionTrue,
+			},
+		}
+		ExpectWithOffset(1, cl.Status().Update(ctx, pod)).To(Succeed())
+	}
+}
+
+func DeleteStsPods(ctx context.Context, cl client.Client, sts *appsv1.StatefulSet) {
+	stsReplicas := *sts.Spec.Replicas
+	for i := 0; i < int(stsReplicas); i++ {
+		podName := fmt.Sprintf("%s-%d", sts.Name, i)
+		pod := &corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      podName,
+				Namespace: sts.Namespace,
+			},
+		}
+		ExpectWithOffset(1, cl.Delete(ctx, pod)).To(Succeed())
+	}
+}