Merge branch 'renovate/gcr.io-kubebuilder-kube-rbac-proxy-0.x' of github.com:open-feature/open-feature-operator into renovate/gcr.io-kubebuilder-kube-rbac-proxy-0.x

Author: beeme1mr

.github/workflows/pr-checks.yml

@@ -11,7 +11,7 @@ on:
       - '**.md'
 env:
   # Default minimum version of Go to support.
-  DEFAULT_GO_VERSION: 1.18
+  DEFAULT_GO_VERSION: 1.19
 
 permissions:
   contents: read

.github/workflows/release-please.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   # Default minimum version of Go to support.
-  DEFAULT_GO_VERSION: 1.18
+  DEFAULT_GO_VERSION: 1.19
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
   GITHUB_PAGES_BRANCH: gh-pages

CODEOWNERS

@@ -1,3 +1,3 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence
-* @AlexsJones @beeme1mr
+* @AlexsJones @beeme1mr @skyerus

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
 
@@ -71,7 +71,7 @@ test: manifests generate fmt vet envtest ## Run tests.
 e2e-test: manifests generate fmt vet
 	kubectl -n open-feature-operator-system apply -f ./test/e2e/e2e.yml
 	kubectl wait --for=condition=Available=True deploy --all -n 'open-feature-operator-system'
-	./test/e2e/e2e.sh '{"value":true,"reason":"DEFAULT","variant":"on"}'
+	./test/e2e/run.sh
 
 .PHONY: lint
 lint:

README.md

@@ -20,6 +20,11 @@ _Requires [cert manager](https://cert-manager.io/docs/installation/kubernetes/)
 
 ## Helm
 
+Install cert manager (if not already installed):
+```
+kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.9.1/cert-manager.yaml
+```
+Install helm charts:
 ```
 helm repo add openfeature https://open-feature.github.io/open-feature-operator/
 ```
@@ -124,15 +129,16 @@ 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
 kind: Pod
 metadata:
   name: nginx
   annotations:
-    openfeature.dev: "enabled"
-    openfeature.dev/featureflagconfiguration: "featureflagconfiguration-sample"
+    openfeature.dev/enabled: "true"
+    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/v1alpha1/zz_generated.deepcopy.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_conversion.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 {
@@ -95,6 +107,7 @@ type FeatureFlagConfigurationStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
+//+kubebuilder:resource:shortName="ff"
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status