fix after rebase

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>

.gitignore

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

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.go

@@ -129,11 +129,7 @@ func (ff *FeatureFlagConfiguration) GenerateConfigMap(name string, namespace str
 			OwnerReferences: references,
 		},
 		Data: map[string]string{
-<<<<<<< HEAD
 			common.FeatureFlagConfigurationConfigMapKey(namespace, name): ff.Spec.FeatureFlagSpec,
-=======
-			utils.FeatureFlagConfigMapKey(namespace, name): ff.Spec.FeatureFlagSpec,
->>>>>>> feat: use v1beta1 in operator logic
 		},
 	}
 }

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.go

@@ -0,0 +1,57 @@
+package common
+
+import "fmt"
+
+type SyncProviderType string
+
+const (
+	SyncProviderKubernetes SyncProviderType = "kubernetes"
+	SyncProviderFilepath   SyncProviderType = "file"
+	SyncProviderHttp       SyncProviderType = "http"
+	SyncProviderGrpc       SyncProviderType = "grpc"
+	SyncProviderFlagdProxy SyncProviderType = "flagd-proxy"
+)
+
+func (s SyncProviderType) IsKubernetes() bool {
+	return s == SyncProviderKubernetes
+}
+
+func (s SyncProviderType) IsHttp() bool {
+	return s == SyncProviderHttp
+}
+
+func (s SyncProviderType) IsFilepath() bool {
+	return s == SyncProviderFilepath
+}
+
+func (s SyncProviderType) IsGrpc() bool {
+	return s == SyncProviderGrpc
+}
+
+func (s SyncProviderType) IsFlagdProxy() bool {
+	return s == SyncProviderFlagdProxy
+}
+
+func TrueVal() *bool {
+	b := true
+	return &b
+}
+
+func FalseVal() *bool {
+	b := false
+	return &b
+}
+
+func EnvVarKey(prefix string, suffix string) string {
+	return fmt.Sprintf("%s_%s", prefix, suffix)
+}
+
+// unique string used to create unique volume mount and file name
+func FeatureFlagConfigurationId(namespace, name string) string {
+	return fmt.Sprintf("%s_%s", namespace, name)
+}
+
+// unique key (and filename) for configMap data
+func FeatureFlagConfigMapKey(namespace, name string) string {
+	return fmt.Sprintf("%s.flagd.json", FeatureFlagConfigurationId(namespace, name))
+}

apis/core/v1beta1/common/common_test.go

@@ -0,0 +1,28 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_FeatureFlagSource_SyncProvider(t *testing.T) {
+	k := SyncProviderKubernetes
+	f := SyncProviderFilepath
+	h := SyncProviderHttp
+	g := SyncProviderGrpc
+
+	require.True(t, k.IsKubernetes())
+	require.True(t, f.IsFilepath())
+	require.True(t, h.IsHttp())
+	require.True(t, g.IsGrpc())
+
+	require.False(t, f.IsKubernetes())
+	require.False(t, h.IsFilepath())
+	require.False(t, k.IsGrpc())
+	require.False(t, g.IsHttp())
+}
+
+func Test_FLagSourceConfiguration_envVarKey(t *testing.T) {
+	require.Equal(t, "pre_suf", EnvVarKey("pre", "suf"))
+}

apis/core/v1beta1/featureflag_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	"encoding/json"
 
-	"github.com/open-feature/open-feature-operator/common/utils"
+	"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"
 )
@@ -93,7 +93,7 @@ func (ff *FeatureFlag) GetReference() metav1.OwnerReference {
 		Kind:       ff.Kind,
 		Name:       ff.Name,
 		UID:        ff.UID,
-		Controller: utils.TrueVal(),
+		Controller: common.TrueVal(),
 	}
 }
 
@@ -112,7 +112,7 @@ func (ff *FeatureFlag) GenerateConfigMap(name string, namespace string, referenc
 			OwnerReferences: references,
 		},
 		Data: map[string]string{
-			utils.FeatureFlagConfigMapKey(namespace, name): string(b),
+			common.FeatureFlagConfigMapKey(namespace, name): string(b),
 		},
 	}, nil
 }

apis/core/v1beta1/featureflag_types_test.go

@@ -3,7 +3,7 @@ package v1beta1
 import (
 	"testing"
 
-	"github.com/open-feature/open-feature-operator/common/utils"
+	"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"
@@ -21,7 +21,7 @@ func Test_FeatureFlag(t *testing.T) {
 					Kind:       "kind",
 					Name:       "ffconf1",
 					UID:        types.UID("5"),
-					Controller: utils.TrueVal(),
+					Controller: common.TrueVal(),
 				},
 			},
 		},
@@ -37,7 +37,7 @@ func Test_FeatureFlag(t *testing.T) {
 		Kind:       ff.Kind,
 		Name:       ff.Name,
 		UID:        ff.UID,
-		Controller: utils.TrueVal(),
+		Controller: common.TrueVal(),
 	}, ff.GetReference())
 
 	name := "cmname"
@@ -48,7 +48,7 @@ func Test_FeatureFlag(t *testing.T) {
 			Kind:       "kind",
 			Name:       "ffconf1",
 			UID:        types.UID("5"),
-			Controller: utils.TrueVal(),
+			Controller: common.TrueVal(),
 		},
 	}