feat: Add online/offline replica support (feast-dev#4812)

* added replica support to online/offline store services Signed-off-by: dandawg <12484302+dandawg@users.noreply.github.com> * Removed unneaded if statement Co-authored-by: Tommy Hughes IV <tchughesiv@gmail.com> Signed-off-by: dandawg <12484302+dandawg@users.noreply.github.com> * fixed missing bracket Signed-off-by: dandawg <12484302+dandawg@users.noreply.github.com> * added doc comments describing replicas Signed-off-by: dandawg <12484302+dandawg@users.noreply.github.com> * Replicas doc wording change Signed-off-by: dandawg <12484302+dandawg@users.noreply.github.com> --------- Signed-off-by: dandawg <12484302+dandawg@users.noreply.github.com> Co-authored-by: Tommy Hughes IV <tchughesiv@gmail.com>
nishantgaurav-dev · Jan 15, 2025 · 67a9955 · 67a9955
1 parent 9a23e03
commit 67a9955
Show file tree

Hide file tree

Showing 13 changed files with 299 additions and 4 deletions.
diff --git a/infra/feast-operator/api/v1alpha1/featurestore_types.go b/infra/feast-operator/api/v1alpha1/featurestore_types.go
@@ -82,6 +82,7 @@ type FeatureStoreServices struct {
 
 // OfflineStore configures the deployed offline store service
 type OfflineStore struct {
+<<<<<<< HEAD
 	ServiceConfigs `json:",inline"`
 	Persistence    *OfflineStorePersistence `json:"persistence,omitempty"`
 <<<<<<< HEAD
@@ -92,6 +93,11 @@ type OfflineStore struct {
 	LogLevel string `json:"logLevel,omitempty"`
 =======
 	TLS            *OfflineTlsConfigs       `json:"tls,omitempty"`
+=======
+	StoreServiceConfigs `json:",inline"`
+	Persistence         *OfflineStorePersistence `json:"persistence,omitempty"`
+	TLS                 *OfflineTlsConfigs       `json:"tls,omitempty"`
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 	// LogLevel sets the logging level for the offline store service
 	// Allowed values: "debug", "info", "warning", "error", "critical".
 	// +kubebuilder:validation:Enum=debug;info;warning;error;critical
@@ -183,13 +189,19 @@ var ValidOfflineStoreDBStorePersistenceTypes = []string{
 
 // OnlineStore configures the deployed online store service
 type OnlineStore struct {
+<<<<<<< HEAD
 	ServiceConfigs `json:",inline"`
 	Persistence    *OnlineStorePersistence `json:"persistence,omitempty"`
 	TLS            *TlsConfigs             `json:"tls,omitempty"`
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> fb0874ae1 (feat: Feast Operator support log level configuration for services (#4808))
+=======
+	StoreServiceConfigs `json:",inline"`
+	Persistence         *OnlineStorePersistence `json:"persistence,omitempty"`
+	TLS                 *TlsConfigs             `json:"tls,omitempty"`
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 	// LogLevel sets the logging level for the online store service
 	// Allowed values: "debug", "info", "warning", "error", "critical".
 	// +kubebuilder:validation:Enum=debug;info;warning;error;critical
@@ -462,6 +474,14 @@ type DefaultConfigs struct {
 	Image *string `json:"image,omitempty"`
 }
 
+// StoreServiceConfigs k8s deployment settings
+type StoreServiceConfigs struct {
+	// Replicas determines the number of pods for the feast service.
+	// When Replicas > 1, persistence is recommended.
+	Replicas       *int32 `json:"replicas,omitempty"`
+	ServiceConfigs `json:",inline"`
+}
+
 // OptionalConfigs k8s container settings that are optional
 type OptionalConfigs struct {
 	Env             *[]corev1.EnvVar             `json:"env,omitempty"`

diff --git a/infra/feast-operator/api/v1alpha1/zz_generated.deepcopy.go b/infra/feast-operator/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml b/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
@@ -467,6 +467,12 @@ spec:
                         x-kubernetes-validations:
                         - message: One selection required between file or store.
                           rule: '[has(self.file), has(self.store)].exists_one(c, c)'
+                      replicas:
+                        description: |-
+                          Replicas determines the number of pods for the feast service.
+                          When Replicas > 1, persistence is recommended.
+                        format: int32
+                        type: integer
                       resources:
                         description: ResourceRequirements describes the compute resource
                           requirements.
@@ -965,6 +971,12 @@ spec:
                         x-kubernetes-validations:
                         - message: One selection required between file or store.
                           rule: '[has(self.file), has(self.store)].exists_one(c, c)'
+                      replicas:
+                        description: |-
+                          Replicas determines the number of pods for the feast service.
+                          When Replicas > 1, persistence is recommended.
+                        format: int32
+                        type: integer
                       resources:
                         description: ResourceRequirements describes the compute resource
                           requirements.
@@ -2047,6 +2059,12 @@ spec:
                             - message: One selection required between file or store.
                               rule: '[has(self.file), has(self.store)].exists_one(c,
                                 c)'
+                          replicas:
+                            description: |-
+                              Replicas determines the number of pods for the feast service.
+                              When Replicas > 1, persistence is recommended.
+                            format: int32
+                            type: integer
                           resources:
                             description: ResourceRequirements describes the compute
                               resource requirements.
@@ -2554,6 +2572,12 @@ spec:
                             - message: One selection required between file or store.
                               rule: '[has(self.file), has(self.store)].exists_one(c,
                                 c)'
+                          replicas:
+                            description: |-
+                              Replicas determines the number of pods for the feast service.
+                              When Replicas > 1, persistence is recommended.
+                            format: int32
+                            type: integer
                           resources:
                             description: ResourceRequirements describes the compute
                               resource requirements.

diff --git a/infra/feast-operator/dist/install.yaml b/infra/feast-operator/dist/install.yaml
@@ -475,6 +475,12 @@ spec:
                         x-kubernetes-validations:
                         - message: One selection required between file or store.
                           rule: '[has(self.file), has(self.store)].exists_one(c, c)'
+                      replicas:
+                        description: |-
+                          Replicas determines the number of pods for the feast service.
+                          When Replicas > 1, persistence is recommended.
+                        format: int32
+                        type: integer
                       resources:
                         description: ResourceRequirements describes the compute resource
                           requirements.
@@ -973,6 +979,12 @@ spec:
                         x-kubernetes-validations:
                         - message: One selection required between file or store.
                           rule: '[has(self.file), has(self.store)].exists_one(c, c)'
+                      replicas:
+                        description: |-
+                          Replicas determines the number of pods for the feast service.
+                          When Replicas > 1, persistence is recommended.
+                        format: int32
+                        type: integer
                       resources:
                         description: ResourceRequirements describes the compute resource
                           requirements.
@@ -2055,6 +2067,12 @@ spec:
                             - message: One selection required between file or store.
                               rule: '[has(self.file), has(self.store)].exists_one(c,
                                 c)'
+                          replicas:
+                            description: |-
+                              Replicas determines the number of pods for the feast service.
+                              When Replicas > 1, persistence is recommended.
+                            format: int32
+                            type: integer
                           resources:
                             description: ResourceRequirements describes the compute
                               resource requirements.
@@ -2562,6 +2580,12 @@ spec:
                             - message: One selection required between file or store.
                               rule: '[has(self.file), has(self.store)].exists_one(c,
                                 c)'
+                          replicas:
+                            description: |-
+                              Replicas determines the number of pods for the feast service.
+                              When Replicas > 1, persistence is recommended.
+                            format: int32
+                            type: integer
                           resources:
                             description: ResourceRequirements describes the compute
                               resource requirements.

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
@@ -135,6 +135,7 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 	Context("When deploying a resource with all db storage services", func() {
 		const resourceName = "cr-name"
 		var pullPolicy = corev1.PullAlways
+		var replicas = int32(1)
 
 		ctx := context.Background()
 
@@ -221,8 +222,12 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
 			By("creating the custom resource for the Kind FeatureStore")
 			err = k8sClient.Get(ctx, typeNamespacedName, featurestore)
 			if err != nil && errors.IsNotFound(err) {
+<<<<<<< HEAD
 				resource := createFeatureStoreResource(resourceName, image, pullPolicy, &[]corev1.EnvVar{})
 >>>>>>> 966b02846 (feat: Updated feast Go operator db stores (#4809))
+=======
+				resource := createFeatureStoreResource(resourceName, image, pullPolicy, replicas, &[]corev1.EnvVar{})
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 				resource.Spec.Services.OfflineStore.Persistence = &feastdevv1alpha1.OfflineStorePersistence{
 					DBPersistence: &feastdevv1alpha1.OfflineStoreDBStorePersistence{
 						Type: string(offlineType),

diff --git a/infra/feast-operator/internal/controller/featurestore_controller_ephemeral_test.go b/infra/feast-operator/internal/controller/featurestore_controller_ephemeral_test.go
@@ -62,6 +62,7 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
 		const offlineType = "duckdb"
 >>>>>>> 668d47b8e (feat: Add TLS support to the Operator (#4796))
 		var pullPolicy = corev1.PullAlways
+		var replicas = int32(1)
 		var testEnvVarName = "testEnvVarName"
 		var testEnvVarValue = "testEnvVarValue"
 
@@ -89,10 +90,14 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
 			By("creating the custom resource for the Kind FeatureStore")
 			err := k8sClient.Get(ctx, typeNamespacedName, featurestore)
 			if err != nil && errors.IsNotFound(err) {
+<<<<<<< HEAD
 				resource := createFeatureStoreResource(resourceName, image, pullPolicy, &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue},
 <<<<<<< HEAD
 					{Name: "fieldRefName", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"}}}}, withEnvFrom())
 =======
+=======
+				resource := createFeatureStoreResource(resourceName, image, pullPolicy, replicas, &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue},
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 					{Name: "fieldRefName", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"}}}})
 >>>>>>> 6c1a66ea8 (feat: PVC configuration and impl (#4750))
 				resource.Spec.Services.OfflineStore.Persistence = &feastdevv1alpha1.OfflineStorePersistence{

diff --git a/infra/feast-operator/internal/controller/featurestore_controller_kubernetes_auth_test.go b/infra/feast-operator/internal/controller/featurestore_controller_kubernetes_auth_test.go
@@ -48,6 +48,7 @@ var _ = Describe("FeatureStore Controller-Kubernetes authorization", func() {
 	Context("When deploying a resource with all ephemeral services and Kubernetes authorization", func() {
 		const resourceName = "kubernetes-authorization"
 		var pullPolicy = corev1.PullAlways
+		var replicas = int32(1)
 
 		ctx := context.Background()
 
@@ -70,8 +71,12 @@ var _ = Describe("FeatureStore Controller-Kubernetes authorization", func() {
 			By("creating the custom resource for the Kind FeatureStore")
 			err := k8sClient.Get(ctx, typeNamespacedName, featurestore)
 			if err != nil && errors.IsNotFound(err) {
+<<<<<<< HEAD
 				resource := createFeatureStoreResource(resourceName, image, pullPolicy, &[]corev1.EnvVar{})
 >>>>>>> 39eb4d80c (feat: RBAC Authorization in Feast Operator (#4786))
+=======
+				resource := createFeatureStoreResource(resourceName, image, pullPolicy, replicas, &[]corev1.EnvVar{})
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 				resource.Spec.AuthzConfig = &feastdevv1alpha1.AuthzConfig{KubernetesAuthz: &feastdevv1alpha1.KubernetesAuthz{
 					Roles: roles,
 				}}

diff --git a/infra/feast-operator/internal/controller/featurestore_controller_objectstore_test.go b/infra/feast-operator/internal/controller/featurestore_controller_objectstore_test.go
@@ -53,6 +53,7 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
 	Context("When deploying a resource with all ephemeral services", func() {
 		const resourceName = "services-object-store"
 		var pullPolicy = corev1.PullAlways
+		var replicas = int32(1)
 		var testEnvVarName = "testEnvVarName"
 		var testEnvVarValue = "testEnvVarValue"
 
@@ -79,10 +80,14 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
 			By("creating the custom resource for the Kind FeatureStore")
 			err := k8sClient.Get(ctx, typeNamespacedName, featurestore)
 			if err != nil && errors.IsNotFound(err) {
+<<<<<<< HEAD
 				resource := createFeatureStoreResource(resourceName, image, pullPolicy, &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue},
 <<<<<<< HEAD
 					{Name: "fieldRefName", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"}}}}, withEnvFrom())
 =======
+=======
+				resource := createFeatureStoreResource(resourceName, image, pullPolicy, replicas, &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue},
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 					{Name: "fieldRefName", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"}}}})
 >>>>>>> bc64ddfac (feat: Object store persistence in operator (#4758))
 				resource.Spec.Services.OnlineStore = nil

diff --git a/infra/feast-operator/internal/controller/featurestore_controller_oidc_auth_test.go b/infra/feast-operator/internal/controller/featurestore_controller_oidc_auth_test.go
@@ -49,6 +49,7 @@ var _ = Describe("FeatureStore Controller-OIDC authorization", func() {
 		const resourceName = "oidc-authorization"
 		const oidcSecretName = "oidc-secret"
 		var pullPolicy = corev1.PullAlways
+		var replicas = int32(1)
 
 		ctx := context.Background()
 
@@ -81,8 +82,12 @@ var _ = Describe("FeatureStore Controller-OIDC authorization", func() {
 			By("creating the custom resource for the Kind FeatureStore")
 			err = k8sClient.Get(ctx, typeNamespacedName, featurestore)
 			if err != nil && errors.IsNotFound(err) {
+<<<<<<< HEAD
 				resource := createFeatureStoreResource(resourceName, image, pullPolicy, &[]corev1.EnvVar{})
 >>>>>>> cd341f8f6 (feat: OIDC authorization in Feast Operator (#4801))
+=======
+				resource := createFeatureStoreResource(resourceName, image, pullPolicy, replicas, &[]corev1.EnvVar{})
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 				resource.Spec.AuthzConfig = &feastdevv1alpha1.AuthzConfig{OidcAuthz: &feastdevv1alpha1.OidcAuthz{
 					SecretRef: corev1.LocalObjectReference{
 						Name: oidcSecretName,

diff --git a/infra/feast-operator/internal/controller/featurestore_controller_pvc_test.go b/infra/feast-operator/internal/controller/featurestore_controller_pvc_test.go
@@ -57,6 +57,7 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
 	Context("When deploying a resource with all ephemeral services", func() {
 		const resourceName = "services-pvc"
 		var pullPolicy = corev1.PullAlways
+		var replicas = int32(1)
 		var testEnvVarName = "testEnvVarName"
 		var testEnvVarValue = "testEnvVarValue"
 
@@ -93,10 +94,14 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
 			By("creating the custom resource for the Kind FeatureStore")
 			err := k8sClient.Get(ctx, typeNamespacedName, featurestore)
 			if err != nil && errors.IsNotFound(err) {
+<<<<<<< HEAD
 				resource := createFeatureStoreResource(resourceName, image, pullPolicy, &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue},
 <<<<<<< HEAD
 					{Name: "fieldRefName", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"}}}}, withEnvFrom())
 =======
+=======
+				resource := createFeatureStoreResource(resourceName, image, pullPolicy, replicas, &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue},
+>>>>>>> 47204bcaf (feat: Add online/offline replica support (#4812))
 					{Name: "fieldRefName", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"}}}})
 >>>>>>> 6c1a66ea8 (feat: PVC configuration and impl (#4750))
 				resource.Spec.Services.OfflineStore.Persistence = &feastdevv1alpha1.OfflineStorePersistence{