test fixes

Signed-off-by: James Milligan <[email protected]>

Author: james-milligan

webhooks/pod_webhook.go

@@ -126,11 +126,12 @@ func (m *PodMutator) Handle(ctx context.Context, req admission.Request) admissio
 	}
 
 	// Check configuration
+	ffNames := []string{}
 	val, ok = pod.GetAnnotations()["openfeature.dev/featureflagconfiguration"]
-	if !ok {
-		return admission.Allowed("FeatureFlagConfiguration not found")
+	if ok {
+		ffNames = parseList(val)
 	}
-	ffNames := parseList(val)
+
 	fcNames := []string{}
 	val, ok = pod.GetAnnotations()["openfeature.dev/flagsourceconfiguration"]
 	if ok {

webhooks/pod_webhook_test.go

@@ -25,6 +25,8 @@ const (
 	existingPod2ServiceAccountName = "existing-pod-2-service-account"
 )
 
+var flagConfig = corev1alpha1.NewFlagSourceConfigurationSpec()
+
 // Sets up environment to simulate an upgrade, with an existing pod already in the cluster
 func setupPreviouslyExistingPods() {
 	ns := &corev1.Namespace{}
@@ -213,17 +215,16 @@ var _ = Describe("pod mutation webhook", func() {
 		podMutationWebhookCleanup()
 	})
 
-	It("should not create flagd sidecar if openfeature.dev/featureflagconfiguration annotation isn't present", func() {
+	It("should create flagd sidecar even if openfeature.dev/featureflagconfiguration annotation isn't present", func() {
 		pod := testPod(defaultPodName, defaultPodServiceAccountName, map[string]string{
 			"openfeature.dev": "enabled",
 		})
-		delete(pod.Annotations, "openfeature.dev/featureflagconfiguration")
 		err := k8sClient.Create(testCtx, pod)
 		Expect(err).ShouldNot(HaveOccurred())
 
 		pod = getPod(defaultPodName)
 
-		Expect(len(pod.Spec.Containers)).To(Equal(1))
+		Expect(len(pod.Spec.Containers)).To(Equal(2))
 
 		podMutationWebhookCleanup()
 	})
@@ -354,30 +355,30 @@ var _ = Describe("pod mutation webhook", func() {
 	})
 
 	It(`should create flagd sidecar if openfeature.dev/enabled annotation is "true"`, func() {
-		pod := testPod(map[string]string{
+		pod := testPod(defaultPodName, defaultPodServiceAccountName, map[string]string{
 			"openfeature.dev/enabled":                  "true",
 			"openfeature.dev/featureflagconfiguration": fmt.Sprintf("%s/%s", mutatePodNamespace, featureFlagConfigurationName),
 		})
 		err := k8sClient.Create(testCtx, pod)
 		Expect(err).ShouldNot(HaveOccurred())
 
-		pod = getPod()
+		pod = getPod(defaultPodName)
 
 		Expect(len(pod.Spec.Containers)).To(Equal(2))
 
 		podMutationWebhookCleanup()
 	})
 
 	It(`should only write non default flagsourceconfiguration env vars to the flagd container`, func() {
-		pod := testPod(map[string]string{
+		pod := testPod(defaultPodName, defaultPodServiceAccountName, map[string]string{
 			"openfeature.dev":                          "enabled",
 			"openfeature.dev/featureflagconfiguration": fmt.Sprintf("%s/%s", mutatePodNamespace, featureFlagConfigurationName),
 			"openfeature.dev/flagsourceconfiguration":  fmt.Sprintf("%s/%s", mutatePodNamespace, flagSourceConfigurationName),
 		})
 		err := k8sClient.Create(testCtx, pod)
 		Expect(err).ShouldNot(HaveOccurred())
 
-		pod = getPod()
+		pod = getPod(defaultPodName)
 		fmt.Println(pod.Spec.Containers[1])
 		Expect(pod.Spec.Containers[1].Env).To(Equal([]corev1.EnvVar{
 			{Name: "FLAGD_METRICS_PORT", Value: "8081"},