Issues fixed

Signed-off-by: THuvaraki <Thuvaraki.E@cloudsolutions.com.sa>

Author: THuvaraki

api/core/v1beta1/featureflag_types.go

@@ -32,26 +32,20 @@ type FeatureFlagSpec struct {
 
 type FlagSpec struct {
 	Flags `json:",inline"`
-	// Metadata holds optional flag-level metadata such as flag set identifiers.
-	// Additional metadata keys are preserved to support flagd metadata inheritance.
 	// +optional
+	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Metadata *FlagMetadata `json:"metadata,omitempty"`
+	// +kubebuilder:validation:Type=object
+	// Metadata holds optional flag-set level metadata.
+	// Additional metadata keys are preserved to support flagd metadata inheritance.
+	Metadata json.RawMessage `json:"metadata,omitempty"`
 	// +optional
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object
 	Evaluators json.RawMessage `json:"$evaluators,omitempty"`
 }
 
-// FlagMetadata captures optional metadata for a flag specification.
-// PreserveUnknownFields keeps compatibility with flagd's metadata inheritance model.
-// +kubebuilder:pruning:PreserveUnknownFields
-type FlagMetadata struct {
-	// +optional
-	FlagSetID string `json:"flagSetId,omitempty"`
-}
-
 // Flags represent the flags specification
 type Flags struct {
 	FlagsMap map[string]Flag `json:"flags"`
@@ -60,20 +54,24 @@ type Flags struct {
 type Flag struct {
 	// +kubebuilder:validation:Enum=ENABLED;DISABLED
 	State string `json:"state"`
-	// +optional
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Metadata *FlagMetadata `json:"metadata,omitempty"`
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object
-	Variants       json.RawMessage `json:"variants"`
-	DefaultVariant string          `json:"defaultVariant"`
+	Variants json.RawMessage `json:"variants"`
+	DefaultVariant string `json:"defaultVariant"`
 	// +optional
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object
 	// Targeting is the json targeting rule
 	Targeting json.RawMessage `json:"targeting,omitempty"`
+	// +optional
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Type=object
+	// Metadata holds optional per-flag metadata.
+	// Additional metadata keys are preserved to support flagd metadata inheritance.
+	Metadata json.RawMessage `json:"metadata,omitempty"`
 }
 
 // FeatureFlagStatus defines the observed state of FeatureFlag
@@ -135,4 +133,4 @@ func (ff *FeatureFlag) GenerateConfigMap(name string, namespace string, referenc
 			common.FeatureFlagConfigMapKey(namespace, name): string(b),
 		},
 	}, nil
-}
+}

api/core/v1beta1/zz_generated.deepcopy.go

@@ -55,11 +55,8 @@ spec:
                           type: string
                         metadata:
                           description: |-
-                            FlagMetadata captures optional metadata for a flag specification.
-                            PreserveUnknownFields keeps compatibility with flagd's metadata inheritance model.
-                          properties:
-                            flagSetId:
-                              type: string
+                            Metadata holds optional per-flag metadata.
+                            Additional metadata keys are preserved to support flagd metadata inheritance.
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         state:
@@ -82,11 +79,8 @@ spec:
                     type: object
                   metadata:
                     description: |-
-                      Metadata holds optional flag-level metadata such as flag set identifiers.
+                      Metadata holds optional flag-set level metadata.
                       Additional metadata keys are preserved to support flagd metadata inheritance.
-                    properties:
-                      flagSetId:
-                        type: string
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
                 required:

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

@@ -14,5 +14,5 @@ configMapGenerator:
 
 images:
 - name: controller
-  newName: open-feature-operator-local
-  newTag: validate
+  newName: ghcr.io/openfeature/operator
+  newTag: latest

config/manager/kustomization.yaml

@@ -108,4 +108,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
+replace github.com/open-feature/open-feature-operator/apis => ./api
+
 replace golang.org/x/net => golang.org/x/net v0.27.0