merge

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

Author: james-milligan

Makefile

@@ -4,7 +4,7 @@ IMG ?= controller:latest
 # customize overlay to be used in the build, DEFAULT or HELM
 KUSTOMIZE_OVERLAY ?= DEFAULT
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-FLAGD_VERSION=v0.2.5
+FLAGD_VERSION=v0.2.7
 CHART_VERSION=v0.2.20# x-release-please-version
 ENVTEST_K8S_VERSION = 1.25
 

README.md

@@ -129,6 +129,7 @@ spec:
 ```
 
 1. Reference the CR within the pod spec annotations
+The `openfeature.dev/featureflagconfiguration` annotation is a comma separated list of CR references, listed as `{namespace}/{name}`. e.g. `"default/featureflagconfiguration-sample, test/featureflagconfiguration-sample-2"`. If no namespace is defined, it is assumed that the flag configuration is in the same namespace as the deployed pod.
 
 ```
 apiVersion: v1
@@ -137,7 +138,7 @@ metadata:
   name: nginx
   annotations:
     openfeature.dev/enabled: "true"
-    openfeature.dev/featureflagconfiguration: "featureflagconfiguration-sample"
+    openfeature.dev/featureflagconfiguration: "default/featureflagconfiguration-sample"
 spec:
   containers:
   - name: nginx

apis/core/v1alpha1/featureflagconfiguration_types.go

@@ -17,6 +17,8 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"fmt"
+
 	"github.com/open-feature/open-feature-operator/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -51,12 +53,31 @@ type FlagDSpec struct {
 
 type FeatureFlagSyncProvider struct {
 	Name string `json:"name"`
+	// +optional
+	// +nullable
+	HttpSyncConfiguration *HttpSyncConfiguration `json:"httpSyncConfiguration"`
+}
+
+// HttpSyncConfiguration defines the desired configuration for a http sync
+type HttpSyncConfiguration struct {
+	// Target is the target url for flagd to poll
+	Target string `json:"target"`
+	// +optional
+	BearerToken string `json:"bearerToken,omitempty"`
 }
 
 func (ffsp FeatureFlagSyncProvider) IsKubernetes() bool {
 	return ffsp.Name == "kubernetes"
 }
 
+func (ffsp FeatureFlagSyncProvider) IsHttp() bool {
+	return ffsp.Name == "http"
+}
+
+func (ffsp FeatureFlagSyncProvider) IsFilepath() bool {
+	return ffsp.Name == "filepath"
+}
+
 type FeatureFlagServiceProvider struct {
 	// +kubebuilder:validation:Enum=flagd
 	Name string `json:"name"`
@@ -118,7 +139,7 @@ func GenerateFfConfigMap(name string, namespace string, references []metav1.Owne
 			OwnerReferences: references,
 		},
 		Data: map[string]string{
-			"config.json": spec.FeatureFlagSpec,
+			fmt.Sprintf("%s.json", name): spec.FeatureFlagSpec,
 		},
 	}
 }

apis/core/v1alpha2/featureflagconfiguration_conversion.go

@@ -19,6 +19,7 @@ package v1alpha2
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
@@ -43,6 +44,12 @@ func (src *FeatureFlagConfiguration) ConvertTo(dstRaw conversion.Hub) error {
 
 	if src.Spec.SyncProvider != nil {
 		dst.Spec.SyncProvider = &v1alpha1.FeatureFlagSyncProvider{Name: src.Spec.SyncProvider.Name}
+		if src.Spec.SyncProvider.HttpSyncConfiguration != nil {
+			dst.Spec.SyncProvider.HttpSyncConfiguration = &v1alpha1.HttpSyncConfiguration{
+				Target:      src.Spec.SyncProvider.HttpSyncConfiguration.Target,
+				BearerToken: src.Spec.SyncProvider.HttpSyncConfiguration.BearerToken,
+			}
+		}
 	}
 
 	if src.Spec.FlagDSpec != nil {
@@ -71,7 +78,15 @@ func (dst *FeatureFlagConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 	}
 
 	if src.Spec.SyncProvider != nil {
-		dst.Spec.SyncProvider = &FeatureFlagSyncProvider{Name: src.Spec.SyncProvider.Name}
+		dst.Spec.SyncProvider = &FeatureFlagSyncProvider{
+			Name: src.Spec.SyncProvider.Name,
+		}
+		if src.Spec.SyncProvider.HttpSyncConfiguration != nil {
+			dst.Spec.SyncProvider.HttpSyncConfiguration = &HttpSyncConfiguration{
+				Target:      src.Spec.SyncProvider.HttpSyncConfiguration.Target,
+				BearerToken: src.Spec.SyncProvider.HttpSyncConfiguration.BearerToken,
+			}
+		}
 	}
 
 	if src.Spec.FlagDSpec != nil {

apis/core/v1alpha2/featureflagconfiguration_types.go

@@ -18,6 +18,7 @@ package v1alpha2
 
 import (
 	"encoding/json"
+
 	"github.com/open-feature/open-feature-operator/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -75,6 +76,17 @@ type FlagSpec struct {
 
 type FeatureFlagSyncProvider struct {
 	Name string `json:"name"`
+	// +optional
+	// +nullable
+	HttpSyncConfiguration *HttpSyncConfiguration `json:"httpSyncConfiguration"`
+}
+
+// HttpSyncConfiguration defines the desired configuration for a http sync
+type HttpSyncConfiguration struct {
+	// Target is the target url for flagd to poll
+	Target string `json:"target"`
+	// +optional
+	BearerToken string `json:"bearerToken,omitempty"`
 }
 
 func (ffsp FeatureFlagSyncProvider) IsKubernetes() bool {

config/crd/bases/core.openfeature.dev_featureflagconfigurations.yaml

@@ -238,6 +238,19 @@ spec:
               syncProvider:
                 nullable: true
                 properties:
+                  httpSyncConfiguration:
+                    description: HttpSyncConfiguration defines the desired configuration
+                      for a http sync
+                    nullable: true
+                    properties:
+                      bearerToken:
+                        type: string
+                      target:
+                        description: Target is the target url for flagd to poll
+                        type: string
+                    required:
+                    - target
+                    type: object
                   name:
                     type: string
                 required:

controllers/featureflagconfiguration_controller.go

@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -153,7 +154,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{
-			"config.json": ffconf.Spec.FeatureFlagSpec,
+			fmt.Sprintf("%s.json", cm.Name): ffconf.Spec.FeatureFlagSpec,
 		}
 		err := r.Client.Update(ctx, &cm)
 		if err != nil {

test/e2e/e2e.yml

@@ -92,4 +92,4 @@ spec:
     - protocol: TCP
       port: 30000
       targetPort: 80
-      nodePort: 30000
+      nodePort: 30000