feat: prepare apis for v1beta1 controllers onboarding (#549)

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

Makefile

@@ -151,7 +151,7 @@ release-manifests: manifests kustomize
     fi
 
 .PHONY: deploy
-deploy: generate manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+deploy: generate kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 

apis/core/v1alpha1/featureflagconfiguration_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"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

apis/core/v1alpha1/flagsourceconfiguration_types.go

@@ -18,45 +18,44 @@ 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"
 )
 
 type SyncProviderType string
 
 const (
-	SidecarEnvVarPrefix              string = "SIDECAR_ENV_VAR_PREFIX"
-	InputConfigurationEnvVarPrefix   string = "SIDECAR"
-	SidecarMetricPortEnvVar          string = "METRICS_PORT"
-	SidecarPortEnvVar                string = "PORT"
-	SidecarSocketPathEnvVar          string = "SOCKET_PATH"
-	SidecarEvaluatorEnvVar           string = "EVALUATOR"
-	SidecarImageEnvVar               string = "IMAGE"
-	SidecarVersionEnvVar             string = "TAG"
-	SidecarProviderArgsEnvVar        string = "PROVIDER_ARGS"
-	SidecarDefaultSyncProviderEnvVar string = "SYNC_PROVIDER"
-	SidecarLogFormatEnvVar           string = "LOG_FORMAT"
-	SidecarProbesEnabledVar          string = "PROBES_ENABLED"
-	defaultSidecarEnvVarPrefix       string = "FLAGD"
-	DefaultMetricPort                int32  = 8014
-	defaultPort                      int32  = 8013
-	defaultSocketPath                string = ""
-	defaultEvaluator                 string = "json"
-	defaultImage                     string = "ghcr.io/open-feature/flagd"
-	// renovate: datasource=github-tags depName=open-feature/flagd/flagd
-	defaultTag             string           = "v0.6.3"
-	defaultLogFormat       string           = "json"
-	defaultProbesEnabled   bool             = true
-	SyncProviderKubernetes SyncProviderType = "kubernetes"
-	SyncProviderFilepath   SyncProviderType = "filepath"
-	SyncProviderHttp       SyncProviderType = "http"
-	SyncProviderGrpc       SyncProviderType = "grpc"
-	SyncProviderFlagdProxy SyncProviderType = "flagd-proxy"
+	SidecarEnvVarPrefix              string           = "SIDECAR_ENV_VAR_PREFIX"
+	InputConfigurationEnvVarPrefix   string           = "SIDECAR"
+	SidecarMetricPortEnvVar          string           = "METRICS_PORT"
+	SidecarPortEnvVar                string           = "PORT"
+	SidecarSocketPathEnvVar          string           = "SOCKET_PATH"
+	SidecarEvaluatorEnvVar           string           = "EVALUATOR"
+	SidecarImageEnvVar               string           = "IMAGE"
+	SidecarVersionEnvVar             string           = "TAG"
+	SidecarProviderArgsEnvVar        string           = "PROVIDER_ARGS"
+	SidecarDefaultSyncProviderEnvVar string           = "SYNC_PROVIDER"
+	SidecarLogFormatEnvVar           string           = "LOG_FORMAT"
+	SidecarProbesEnabledVar          string           = "PROBES_ENABLED"
+	defaultSidecarEnvVarPrefix       string           = "FLAGD"
+	DefaultMetricPort                int32            = 8014
+	defaultPort                      int32            = 8013
+	defaultSocketPath                string           = ""
+	defaultEvaluator                 string           = "json"
+	defaultImage                     string           = "ghcr.io/open-feature/flagd"
+	defaultTag                       string           = "v0.6.3"
+	defaultLogFormat                 string           = "json"
+	defaultProbesEnabled             bool             = true
+	SyncProviderKubernetes           SyncProviderType = "kubernetes"
+	SyncProviderFilepath             SyncProviderType = "filepath"
+	SyncProviderHttp                 SyncProviderType = "http"
+	SyncProviderGrpc                 SyncProviderType = "grpc"
+	SyncProviderFlagdProxy           SyncProviderType = "flagd-proxy"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!

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/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)
+}