fix: uniqueness of featureflagconfiguration file path (#323)

Signed-off-by: Skye Gill <gill.skye95@gmail.com>
open-feature · Jan 27, 2023 · 2b10945 · 2b10945
1 parent 2ec454c
commit 2b10945
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/apis/core/v1alpha1/featureflagconfiguration_types.go b/apis/core/v1alpha1/featureflagconfiguration_types.go
@@ -128,7 +128,11 @@ func GenerateFfConfigMap(name string, namespace string, references []metav1.Owne
 			OwnerReferences: references,
 		},
 		Data: map[string]string{
-			fmt.Sprintf("%s.json", name): spec.FeatureFlagSpec,
+			FeatureFlagConfigurationConfigMapDataKeyName(namespace, name): spec.FeatureFlagSpec,
 		},
 	}
 }
+
+func FeatureFlagConfigurationConfigMapDataKeyName(namespace, name string) string {
+	return fmt.Sprintf("%s_%s.json", namespace, name)
+}
diff --git a/controllers/featureflagconfiguration_controller.go b/controllers/featureflagconfiguration_controller.go
@@ -18,7 +18,6 @@ package controllers
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -151,7 +150,7 @@ func (r *FeatureFlagConfigurationReconciler) Reconcile(ctx context.Context, req
 		// Update ConfigMap Spec
 		r.Log.Info("Updating ConfigMap Spec " + cm.Name)
 		cm.Data = map[string]string{
-			fmt.Sprintf("%s.json", cm.Name): ffconf.Spec.FeatureFlagSpec,
+			corev1alpha1.FeatureFlagConfigurationConfigMapDataKeyName(cm.Namespace, cm.Name): ffconf.Spec.FeatureFlagSpec,
 		}
 		err := r.Client.Update(ctx, &cm)
 		if err != nil {

diff --git a/webhooks/pod_webhook.go b/webhooks/pod_webhook.go
@@ -400,7 +400,7 @@ func (m *PodMutator) injectSidecar(
 			volumeMounts = append(volumeMounts, corev1.VolumeMount{
 				Name:      featureFlag.Name,
 				MountPath: fileSyncMountPath(featureFlag),
-				SubPath:   fileSyncFileName(featureFlag),
+				SubPath:   corev1alpha1.FeatureFlagConfigurationConfigMapDataKeyName(featureFlag.Namespace, featureFlag.Name),
 			})
 		default:
 			err := fmt.Errorf(
@@ -475,11 +475,9 @@ func setSecurityContext() *corev1.SecurityContext {
 }
 
 func fileSyncMountPath(featureFlag *corev1alpha1.FeatureFlagConfiguration) string {
-	return fmt.Sprintf("%s/%s", rootFileSyncMountPath, fileSyncFileName(featureFlag))
-}
-
-func fileSyncFileName(featureFlag *corev1alpha1.FeatureFlagConfiguration) string {
-	return fmt.Sprintf("%s.json", featureFlag.Name)
+	return fmt.Sprintf("%s/%s", rootFileSyncMountPath,
+		corev1alpha1.FeatureFlagConfigurationConfigMapDataKeyName(featureFlag.Namespace, featureFlag.Name),
+	)
 }
 
 func OpenFeatureEnabledAnnotationIndex(o client.Object) []string {

diff --git a/webhooks/pod_webhook_test.go b/webhooks/pod_webhook_test.go
@@ -359,7 +359,7 @@ var _ = Describe("pod mutation webhook", func() {
 		}))
 		Expect(len(cm.OwnerReferences)).To(Equal(2))
 		Expect(cm.Data).To(Equal(map[string]string{
-			fmt.Sprintf("%s.json", featureFlagConfigurationName): ffConfig.Spec.FeatureFlagSpec,
+			fmt.Sprintf("%s_%s.json", mutatePodNamespace, featureFlagConfigurationName): ffConfig.Spec.FeatureFlagSpec,
 		}))
 
 		podMutationWebhookCleanup()
@@ -456,7 +456,7 @@ var _ = Describe("pod mutation webhook", func() {
 		Expect(pod.Spec.Containers[1].Args).To(Equal([]string{
 			"start",
 			"--uri",
-			"file:/etc/flagd/test-feature-flag-configuration.json",
+			"file:/etc/flagd/test-mutate-pod_test-feature-flag-configuration.json",
 			"--sync-provider-args",
 			"key=value",
 			"--sync-provider-args",