feat: use v1beta1 in operator logic

Signed-off-by: odubajDT <[email protected]>

.github/scripts/create-reports.sh

@@ -31,7 +31,7 @@ for namespace in $(kubectl get namespaces -o jsonpath='{.items[*].metadata.name}
     createResourceReport "$logsDir/$namespace" "$namespace" "Daemonsets" false
     createResourceReport "$logsDir/$namespace" "$namespace" "Statefulsets" false
     createResourceReport "$logsDir/$namespace" "$namespace" "Jobs" false
-    createResourceReport "$logsDir/$namespace" "$namespace" "FeatureFlagConfiguration" false
-    createResourceReport "$logsDir/$namespace" "$namespace" "FlagSourceConfiguration" false
+    createResourceReport "$logsDir/$namespace" "$namespace" "FeatureFlag" false
+    createResourceReport "$logsDir/$namespace" "$namespace" "FeatureFlagSource" false
 
 done

.github/workflows/pr-checks.yml

@@ -141,12 +141,12 @@ jobs:
           IMG=open-feature-operator-local:${{ github.sha }} make deploy-operator
           IMG=open-feature-operator-local:${{ github.sha }} make e2e-test-kuttl
       - name: Create reports
-        if: always()
+        if: failure()
         working-directory: ./.github/scripts
         run: ./create-reports.sh
 
       - name: Upload cluster logs
-        if: always()
+        if: failure()
         uses: actions/upload-artifact@v3
         with:
           name: e2e-tests

.gitignore

@@ -31,3 +31,5 @@ testbin/*
 *.swo
 *~
 
+go.work
+go.work.sum

Dockerfile

@@ -14,7 +14,7 @@ COPY main.go main.go
 COPY apis/ apis/
 COPY webhooks/ webhooks/
 COPY controllers/ controllers/
-COPY pkg/ pkg/
+COPY common/ common/
 
 ARG TARGETOS
 ARG TARGETARCH

Makefile

@@ -200,7 +200,7 @@ CRDOC ?= $(LOCALBIN)/crdoc
 KUSTOMIZE_VERSION ?= v4.5.7
 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
 CONTROLLER_TOOLS_VERSION ?= v0.10.0
-CRDOC_VERSION ?= v0.6.2
+CRDOC_VERSION ?= v0.7.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

apis/core/v1alpha1/featureflagconfiguration_types_test.go

@@ -2,12 +2,11 @@ package v1alpha1
 
 import (
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
-	"testing"
-
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"testing"
 )
 
 func Test_FeatureFlagConfiguration(t *testing.T) {

apis/core/v1alpha1/flagsourceconfiguration_types.go

@@ -18,11 +18,11 @@ package v1alpha1
 
 import (
 	"fmt"
-	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	"os"
 	"strconv"
 	"strings"
 
+	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -49,7 +49,7 @@ const (
 	defaultEvaluator                 string = "json"
 	defaultImage                     string = "ghcr.io/open-feature/flagd"
 	// renovate: datasource=github-tags depName=open-feature/flagd/flagd
-	defaultTag             string           = "v0.6.3"
+	defaultTag             string           = "v0.7.0"
 	defaultLogFormat       string           = "json"
 	defaultProbesEnabled   bool             = true
 	SyncProviderKubernetes SyncProviderType = "kubernetes"

apis/core/v1alpha1/flagsourceconfiguration_types_test.go

@@ -1,9 +1,9 @@
 package v1alpha1
 
 import (
-	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	"testing"
 
+	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 )

apis/core/v1beta1/common/common_test.go

@@ -6,6 +6,18 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func Test_FLagSourceConfiguration_EnvVarKey(t *testing.T) {
+	require.Equal(t, "pre_suf", EnvVarKey("pre", "suf"))
+}
+
+func Test_FLagSourceConfiguration_FeatureFlagConfigurationId(t *testing.T) {
+	require.Equal(t, "pre_suf", FeatureFlagConfigurationId("pre", "suf"))
+}
+
+func Test_FLagSourceConfiguration_FeatureFlagConfigMapKey(t *testing.T) {
+	require.Equal(t, "pre_suf.flagd.json", FeatureFlagConfigMapKey("pre", "suf"))
+}
+
 func Test_FeatureFlagSource_SyncProvider(t *testing.T) {
 	k := SyncProviderKubernetes
 	f := SyncProviderFilepath
@@ -23,14 +35,6 @@ func Test_FeatureFlagSource_SyncProvider(t *testing.T) {
 	require.False(t, g.IsHttp())
 }
 
-func Test_FLagSourceConfiguration_EnvVarKey(t *testing.T) {
+func Test_FLagSourceConfiguration_envVarKey(t *testing.T) {
 	require.Equal(t, "pre_suf", EnvVarKey("pre", "suf"))
 }
-
-func Test_FLagSourceConfiguration_FeatureFlagConfigurationId(t *testing.T) {
-	require.Equal(t, "pre_suf", FeatureFlagConfigurationId("pre", "suf"))
-}
-
-func Test_FLagSourceConfiguration_FeatureFlagConfigMapKey(t *testing.T) {
-	require.Equal(t, "pre_suf.flagd.json", FeatureFlagConfigMapKey("pre", "suf"))
-}

apis/core/v1beta1/featureflag_types.go

@@ -19,6 +19,8 @@ package v1beta1
 import (
 	"encoding/json"
 
+	"github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -61,6 +63,7 @@ type FeatureFlagStatus struct {
 //+kubebuilder:resource:shortName="ffc"
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:storageversion
 
 // FeatureFlag is the Schema for the featureflags API
 type FeatureFlag struct {
@@ -83,3 +86,33 @@ type FeatureFlagList struct {
 func init() {
 	SchemeBuilder.Register(&FeatureFlag{}, &FeatureFlagList{})
 }
+
+func (ff *FeatureFlag) GetReference() metav1.OwnerReference {
+	return metav1.OwnerReference{
+		APIVersion: ff.APIVersion,
+		Kind:       ff.Kind,
+		Name:       ff.Name,
+		UID:        ff.UID,
+		Controller: common.TrueVal(),
+	}
+}
+
+func (ff *FeatureFlag) GenerateConfigMap(name string, namespace string, references []metav1.OwnerReference) (*corev1.ConfigMap, error) {
+	b, err := json.Marshal(ff.Spec.FlagSpec)
+	if err != nil {
+		return nil, err
+	}
+	return &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			Annotations: map[string]string{
+				"openfeature.dev/featureflag": name,
+			},
+			OwnerReferences: references,
+		},
+		Data: map[string]string{
+			common.FeatureFlagConfigMapKey(namespace, name): string(b),
+		},
+	}, nil
+}

apis/core/v1beta1/featureflag_types_test.go

@@ -0,0 +1,70 @@
+package v1beta1
+
+import (
+	"testing"
+
+	"github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	"github.com/stretchr/testify/require"
+	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+func Test_FeatureFlag(t *testing.T) {
+	ff := FeatureFlag{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      "ffconf1",
+			Namespace: "test",
+			OwnerReferences: []v1.OwnerReference{
+				{
+					APIVersion: "ver",
+					Kind:       "kind",
+					Name:       "ffconf1",
+					UID:        types.UID("5"),
+					Controller: common.TrueVal(),
+				},
+			},
+		},
+		Spec: FeatureFlagSpec{
+			FlagSpec: FlagSpec{
+				Flags: map[string]Flag{},
+			},
+		},
+	}
+
+	require.Equal(t, v1.OwnerReference{
+		APIVersion: ff.APIVersion,
+		Kind:       ff.Kind,
+		Name:       ff.Name,
+		UID:        ff.UID,
+		Controller: common.TrueVal(),
+	}, ff.GetReference())
+
+	name := "cmname"
+	namespace := "cmnamespace"
+	references := []v1.OwnerReference{
+		{
+			APIVersion: "ver",
+			Kind:       "kind",
+			Name:       "ffconf1",
+			UID:        types.UID("5"),
+			Controller: common.TrueVal(),
+		},
+	}
+
+	cm, _ := ff.GenerateConfigMap(name, namespace, references)
+
+	require.Equal(t, corev1.ConfigMap{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			Annotations: map[string]string{
+				"openfeature.dev/featureflag": name,
+			},
+			OwnerReferences: references,
+		},
+		Data: map[string]string{
+			"cmnamespace_cmname.flagd.json": "{\"flags\":{}}",
+		},
+	}, *cm)
+}