fix: Made fixes to Go Operator DB persistence (feast-dev#4830)

* Made fixes to Go Operator DB persistence Signed-off-by: Theodor Mihalache <[email protected]> * Fixes following review Signed-off-by: Theodor Mihalache <[email protected]> --------- Signed-off-by: Theodor Mihalache <[email protected]>
nishantgaurav-dev · Jan 15, 2025 · 8b7a98f · 8b7a98f
1 parent 117d464
commit 8b7a98f
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 25 deletions.
diff --git a/infra/feast-operator/api/v1alpha1/featurestore_types.go b/infra/feast-operator/api/v1alpha1/featurestore_types.go
@@ -115,11 +115,15 @@ type OfflineStorePersistence struct {
 
 // OfflineStoreFilePersistence configures the file-based persistence for the offline store service
 type OfflineStoreFilePersistence struct {
+<<<<<<< HEAD
 <<<<<<< HEAD
 	// +kubebuilder:validation:Enum=file;dask;duckdb
 =======
 	// +kubebuilder:validation:Enum=dask;duckdb
 >>>>>>> 6c1a66ea8 (feat: PVC configuration and impl (#4750))
+=======
+	// +kubebuilder:validation:Enum=file;dask;duckdb
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 	Type      string     `json:"type,omitempty"`
 	PvcConfig *PvcConfig `json:"pvc,omitempty"`
 }
@@ -128,6 +132,7 @@ var ValidOfflineStoreFilePersistenceTypes = []string{
 	"dask",
 	"duckdb",
 	"file",
+<<<<<<< HEAD
 }
 
 // OfflineStoreDBStorePersistence configures the DB store persistence for the offline store service
@@ -150,11 +155,13 @@ var ValidOfflineStoreDBStorePersistenceTypes = []string{
 	"redis",
 	"athena",
 	"mssql",
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 }
 
 // OfflineStoreDBStorePersistence configures the DB store persistence for the offline store service
 type OfflineStoreDBStorePersistence struct {
-	// +kubebuilder:validation:Enum=snowflake.offline;bigquery;redshift;spark;postgres;feast_trino.trino.TrinoOfflineStore;redis
+	// +kubebuilder:validation:Enum=snowflake.offline;bigquery;redshift;spark;postgres;trino;redis;athena;mssql
 	Type string `json:"type"`
 	// Data store parameters should be placed as-is from the "feature_store.yaml" under the secret key. "registry_type" & "type" fields should be removed.
 	SecretRef corev1.LocalObjectReference `json:"secretRef"`
@@ -168,8 +175,10 @@ var ValidOfflineStoreDBStorePersistenceTypes = []string{
 	"redshift",
 	"spark",
 	"postgres",
-	"feast_trino.trino.TrinoOfflineStore",
+	"trino",
 	"redis",
+	"athena",
+	"mssql",
 }
 
 // OnlineStore configures the deployed online store service
@@ -215,8 +224,12 @@ type OnlineStoreFilePersistence struct {
 
 // OnlineStoreDBStorePersistence configures the DB store persistence for the offline store service
 type OnlineStoreDBStorePersistence struct {
+<<<<<<< HEAD
 <<<<<<< HEAD
 	// +kubebuilder:validation:Enum=snowflake.online;redis;ikv;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase;milvus
+=======
+	// +kubebuilder:validation:Enum=snowflake.online;redis;ikv;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 	Type string `json:"type"`
 	// Data store parameters should be placed as-is from the "feature_store.yaml" under the secret key. "registry_type" & "type" fields should be removed.
 	SecretRef corev1.LocalObjectReference `json:"secretRef"`
@@ -257,10 +270,14 @@ var ValidOnlineStoreDBStorePersistenceTypes = []string{
 	"hazelcast",
 	"singlestore",
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 	"hbase",
 	"elasticsearch",
 	"qdrant",
 	"couchbase",
+<<<<<<< HEAD
 	"milvus",
 =======
 type OnlineStoreFilePersistence struct {
@@ -269,6 +286,8 @@ type OnlineStoreFilePersistence struct {
 >>>>>>> 6c1a66ea8 (feat: PVC configuration and impl (#4750))
 =======
 >>>>>>> 863a82cb7 (feat: Added feast Go operator db stores support (#4771))
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 }
 
 // LocalRegistryConfig configures the deployed registry service

diff --git a/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml b/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
@@ -440,6 +440,9 @@ spec:
                                 - spark
                                 - postgres
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
                                 - trino
                                 - redis
                                 - athena
@@ -949,6 +952,10 @@ spec:
                                 - mysql
                                 - hazelcast
                                 - singlestore
+                                - hbase
+                                - elasticsearch
+                                - qdrant
+                                - couchbase
                                 type: string
                             required:
                             - secretRef
@@ -2012,6 +2019,9 @@ spec:
                                     - spark
                                     - postgres
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
                                     - trino
                                     - redis
                                     - athena
@@ -2530,6 +2540,10 @@ spec:
                                     - mysql
                                     - hazelcast
                                     - singlestore
+                                    - hbase
+                                    - elasticsearch
+                                    - qdrant
+                                    - couchbase
                                     type: string
                                 required:
                                 - secretRef

diff --git a/infra/feast-operator/dist/install.yaml b/infra/feast-operator/dist/install.yaml
@@ -448,6 +448,9 @@ spec:
                                 - spark
                                 - postgres
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
                                 - trino
                                 - redis
                                 - athena
@@ -957,6 +960,10 @@ spec:
                                 - mysql
                                 - hazelcast
                                 - singlestore
+                                - hbase
+                                - elasticsearch
+                                - qdrant
+                                - couchbase
                                 type: string
                             required:
                             - secretRef
@@ -2020,6 +2027,9 @@ spec:
                                     - spark
                                     - postgres
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
                                     - trino
                                     - redis
                                     - athena
@@ -2538,6 +2548,10 @@ spec:
                                     - mysql
                                     - hazelcast
                                     - singlestore
+                                    - hbase
+                                    - elasticsearch
+                                    - qdrant
+                                    - couchbase
                                     type: string
                                 required:
                                 - secretRef

diff --git a/infra/feast-operator/internal/controller/featurestore_controller_db_store_test.go b/infra/feast-operator/internal/controller/featurestore_controller_db_store_test.go
@@ -78,11 +78,15 @@ sqlalchemy_config_kwargs:
   pool_pre_ping: true
 `
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 var secretContainingValidTypeYamlString = `
 =======
 var invalidSecretContainingTypeYamlString = `
 >>>>>>> 966b02846 (feat: Updated feast Go operator db stores (#4809))
+=======
+var secretContainingValidTypeYamlString = `
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 type: cassandra
 hosts:
   - 192.168.1.1
@@ -323,6 +327,7 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 
 			Expect(err.Error()).To(Equal("secret key invalid.secret.key doesn't exist in secret online-store-secret"))
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 			By("Referring to a secret that contains parameter named type with invalid value")
 =======
@@ -354,12 +359,14 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 
 			Expect(err.Error()).To(Equal("secret key cassandra in secret online-store-secret contains invalid tag named type"))
 
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 			By("Referring to a secret that contains parameter named type with invalid value")
 			resource = &feastdevv1alpha1.FeatureStore{}
 			err = k8sClient.Get(ctx, typeNamespacedName, resource)
 			Expect(err).NotTo(HaveOccurred())
 
-			secret = &corev1.Secret{}
+			secret := &corev1.Secret{}
 			err = k8sClient.Get(ctx, onlineSecretNamespacedName, secret)
 			Expect(err).NotTo(HaveOccurred())
 >>>>>>> 966b02846 (feat: Updated feast Go operator db stores (#4809))
@@ -378,6 +385,7 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 			})
 			Expect(err).To(HaveOccurred())
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 			Expect(err.Error()).To(Equal("secret key cassandra in secret online-store-secret contains tag named type with value wrong"))
 =======
@@ -415,6 +423,9 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 
 			Expect(err.Error()).To(Equal("secret key sql in secret registry-store-secret contains invalid tag named registry_type"))
 >>>>>>> 966b02846 (feat: Updated feast Go operator db stores (#4809))
+=======
+			Expect(err.Error()).To(Equal("secret key cassandra in secret online-store-secret contains tag named type with value wrong"))
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 		})
 
 		It("should successfully reconcile the resource", func() {
@@ -550,6 +561,9 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 			Expect(controllerutil.HasControllerReference(svc)).To(BeTrue())
 			Expect(svc.Spec.Ports[0].TargetPort).To(Equal(intstr.FromInt(int(services.FeastServiceConstants[services.RegistryFeastType].TargetHttpPort))))
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 
 			By("Referring to a secret that contains parameter named type")
 			resource = &feastdevv1alpha1.FeatureStore{}
@@ -604,8 +618,11 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 				NamespacedName: typeNamespacedName,
 			})
 			Expect(err).To(Not(HaveOccurred()))
+<<<<<<< HEAD
 =======
 >>>>>>> 966b02846 (feat: Updated feast Go operator db stores (#4809))
+=======
+>>>>>>> 4b8378c2a (fix: Made fixes to Go Operator DB persistence (#4830))
 		})
 
 		It("should properly encode a feature_store.yaml config", func() {