Add support for setting env vars in services

Signed-off-by: Theodor Mihalache <[email protected]>

infra/feast-operator/Makefile

@@ -29,11 +29,11 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # feast.dev/feast-operator-bundle:$VERSION and feast.dev/feast-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= feastdev/feast-operator
+IMAGE_TAG_BASE ?= quay.io/tmihalac/feastdev/feast-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
-BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
+BUNDLE_IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
 
 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
 BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)

infra/feast-operator/api/v1alpha1/featurestore_types.go

@@ -121,6 +121,7 @@ type DefaultConfigs struct {
 
 // OptionalConfigs k8s container settings that are optional
 type OptionalConfigs struct {
+	Env             *[]corev1.EnvVar             `json:"env,omitempty"`
 	ImagePullPolicy *corev1.PullPolicy           `json:"imagePullPolicy,omitempty"`
 	Resources       *corev1.ResourceRequirements `json:"resources,omitempty"`
 }

infra/feast-operator/bundle/manifests/feast-operator.clusterserviceversion.yaml

@@ -11,12 +11,25 @@ metadata:
             "name": "sample"
           },
           "spec": {
-            "feastProject": "my_project"
+            "feastProject": "my_project",
+            "services": {
+              "offlineStore": {
+                "image": "quay.io/tmihalac/feastdev/feature-server:0.41.0"
+              },
+              "onlineStore": {
+                "image": "quay.io/tmihalac/feastdev/feature-server:0.41.0"
+              },
+              "registry": {
+                "local": {
+                  "image": "quay.io/tmihalac/feastdev/feature-server:0.41.0"
+                }
+              }
+            }
           }
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-11-01T13:05:11Z"
+    createdAt: "2024-11-04T18:58:30Z"
     operators.operatorframework.io/builder: operator-sdk-v1.37.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
   name: feast-operator.v0.41.0
@@ -150,7 +163,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: feastdev/feast-operator:0.41.0
+                image: quay.io/tmihalac/feastdev/feast-operator:0.41.0
                 livenessProbe:
                   httpGet:
                     path: /healthz

infra/feast-operator/config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: feastdev/feast-operator
+  newName: quay.io/tmihalac/feastdev/feast-operator
   newTag: 0.41.0

infra/feast-operator/config/samples/v1alpha1_featurestore.yaml

@@ -4,3 +4,11 @@ metadata:
   name: sample
 spec:
   feastProject: my_project
+  services:
+    offlineStore:
+      image: 'quay.io/tmihalac/feastdev/feature-server:0.41.0'
+    onlineStore:
+      image: 'quay.io/tmihalac/feastdev/feature-server:0.41.0'
+    registry:
+      local:
+        image: 'quay.io/tmihalac/feastdev/feature-server:0.41.0'

infra/feast-operator/internal/controller/featurestore_controller_test.go

@@ -382,7 +382,9 @@ var _ = Describe("FeatureStore Controller", func() {
 	Context("When reconciling a resource with all services enabled", func() {
 		const resourceName = "services"
 		image := "test:latest"
-		var pullPolicy corev1.PullPolicy = corev1.PullAlways
+		var pullPolicy = corev1.PullAlways
+		var testEnvVarName = "testEnvVarName"
+		var testEnvVarValue = "testEnvVarValue"
 
 		ctx := context.Background()
 
@@ -396,29 +398,7 @@ var _ = Describe("FeatureStore Controller", func() {
 			By("creating the custom resource for the Kind FeatureStore")
 			err := k8sClient.Get(ctx, typeNamespacedName, featurestore)
 			if err != nil && errors.IsNotFound(err) {
-				resource := &feastdevv1alpha1.FeatureStore{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      resourceName,
-						Namespace: "default",
-					},
-					Spec: feastdevv1alpha1.FeatureStoreSpec{
-						FeastProject: feastProject,
-						Services: &feastdevv1alpha1.FeatureStoreServices{
-							OfflineStore: &feastdevv1alpha1.OfflineStore{},
-							OnlineStore: &feastdevv1alpha1.OnlineStore{
-								ServiceConfigs: feastdevv1alpha1.ServiceConfigs{
-									DefaultConfigs: feastdevv1alpha1.DefaultConfigs{
-										Image: &image,
-									},
-									OptionalConfigs: feastdevv1alpha1.OptionalConfigs{
-										ImagePullPolicy: &pullPolicy,
-										Resources:       &corev1.ResourceRequirements{},
-									},
-								},
-							},
-						},
-					},
-				}
+				resource := createFeatureStoreResource(resourceName, image, pullPolicy, &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue}})
 				Expect(k8sClient.Create(ctx, resource)).To(Succeed())
 			}
 		})
@@ -463,6 +443,7 @@ var _ = Describe("FeatureStore Controller", func() {
 			Expect(resource.Status.Applied.Services.OfflineStore.Resources).To(BeNil())
 			Expect(resource.Status.Applied.Services.OfflineStore.Image).To(Equal(&services.DefaultImage))
 			Expect(resource.Status.Applied.Services.OnlineStore).NotTo(BeNil())
+			Expect(resource.Status.Applied.Services.OnlineStore.Env).To(Equal(&[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue}}))
 			Expect(resource.Status.Applied.Services.OnlineStore.ImagePullPolicy).To(Equal(&pullPolicy))
 			Expect(resource.Status.Applied.Services.OnlineStore.Resources).NotTo(BeNil())
 			Expect(resource.Status.Applied.Services.OnlineStore.Image).To(Equal(&image))
@@ -658,7 +639,7 @@ var _ = Describe("FeatureStore Controller", func() {
 				deploy)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
-			Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(1))
+			Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(2))
 			Expect(deploy.Spec.Template.Spec.Containers[0].ImagePullPolicy).To(Equal(corev1.PullAlways))
 			env = getFeatureStoreYamlEnvVar(deploy.Spec.Template.Spec.Containers[0].Env)
 			Expect(env).NotTo(BeNil())
@@ -689,6 +670,7 @@ var _ = Describe("FeatureStore Controller", func() {
 				Registry: regRemote,
 			}
 			Expect(repoConfigOnline).To(Equal(onlineConfig))
+			Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(2))
 
 			// check client config
 			cm := &corev1.ConfigMap{}
@@ -751,6 +733,89 @@ var _ = Describe("FeatureStore Controller", func() {
 			Expect(repoConfig).To(Equal(testConfig))
 		})
 
+		It("should properly set container env variables", func() {
+			By("Reconciling the created resource")
+			controllerReconciler := &FeatureStoreReconciler{
+				Client: k8sClient,
+				Scheme: k8sClient.Scheme(),
+			}
+
+			_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
+				NamespacedName: typeNamespacedName,
+			})
+			Expect(err).NotTo(HaveOccurred())
+
+			resource := &feastdevv1alpha1.FeatureStore{}
+			err = k8sClient.Get(ctx, typeNamespacedName, resource)
+			Expect(err).NotTo(HaveOccurred())
+
+			req, err := labels.NewRequirement(services.NameLabelKey, selection.Equals, []string{resource.Name})
+			Expect(err).NotTo(HaveOccurred())
+			labelSelector := labels.NewSelector().Add(*req)
+			listOpts := &client.ListOptions{Namespace: resource.Namespace, LabelSelector: labelSelector}
+			deployList := appsv1.DeploymentList{}
+			err = k8sClient.List(ctx, &deployList, listOpts)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(deployList.Items).To(HaveLen(3))
+
+			svcList := corev1.ServiceList{}
+			err = k8sClient.List(ctx, &svcList, listOpts)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(svcList.Items).To(HaveLen(3))
+
+			cmList := corev1.ConfigMapList{}
+			err = k8sClient.List(ctx, &cmList, listOpts)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(cmList.Items).To(HaveLen(1))
+
+			feast := services.FeastServices{
+				Client:       controllerReconciler.Client,
+				Context:      ctx,
+				Scheme:       controllerReconciler.Scheme,
+				FeatureStore: resource,
+			}
+
+			fsYamlStr := ""
+			fsYamlStr, err = feast.GetServiceFeatureStoreYamlBase64(services.OnlineFeastType)
+			Expect(err).NotTo(HaveOccurred())
+
+			// check online config
+			deploy := &appsv1.Deployment{}
+			err = k8sClient.Get(ctx, types.NamespacedName{
+				Name:      feast.GetFeastServiceName(services.OnlineFeastType),
+				Namespace: resource.Namespace,
+			},
+				deploy)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
+			Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(2))
+			Expect(areEnvVarArraysEqual(deploy.Spec.Template.Spec.Containers[0].Env, []corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue}, {Name: services.FeatureStoreYamlEnvVar, Value: fsYamlStr}})).To(BeTrue())
+			Expect(deploy.Spec.Template.Spec.Containers[0].ImagePullPolicy).To(Equal(corev1.PullAlways))
+
+			// change feast project and reconcile
+			resourceNew := resource.DeepCopy()
+			resourceNew.Spec.Services.OnlineStore.Env = &[]corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue + "1"}, {Name: services.FeatureStoreYamlEnvVar, Value: fsYamlStr}}
+			err = k8sClient.Update(ctx, resourceNew)
+			Expect(err).NotTo(HaveOccurred())
+			_, err = controllerReconciler.Reconcile(ctx, reconcile.Request{
+				NamespacedName: typeNamespacedName,
+			})
+			Expect(err).NotTo(HaveOccurred())
+
+			err = k8sClient.Get(ctx, typeNamespacedName, resource)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(areEnvVarArraysEqual(*resource.Status.Applied.Services.OnlineStore.Env, []corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue + "1"}, {Name: services.FeatureStoreYamlEnvVar, Value: fsYamlStr}})).To(BeTrue())
+			err = k8sClient.Get(ctx, types.NamespacedName{
+				Name:      feast.GetFeastServiceName(services.OnlineFeastType),
+				Namespace: resource.Namespace,
+			},
+				deploy)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(2))
+			Expect(areEnvVarArraysEqual(deploy.Spec.Template.Spec.Containers[0].Env, []corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue + "1"}, {Name: services.FeatureStoreYamlEnvVar, Value: fsYamlStr}})).To(BeTrue())
+		})
+
 		It("Should delete k8s objects owned by the FeatureStore CR", func() {
 			By("changing which feast services are configured in the CR")
 			controllerReconciler := &FeatureStoreReconciler{
@@ -1122,6 +1187,33 @@ var _ = Describe("FeatureStore Controller", func() {
 	})
 })
 
+func createFeatureStoreResource(resourceName string, image string, pullPolicy corev1.PullPolicy, envVars *[]corev1.EnvVar) *feastdevv1alpha1.FeatureStore {
+	return &feastdevv1alpha1.FeatureStore{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      resourceName,
+			Namespace: "default",
+		},
+		Spec: feastdevv1alpha1.FeatureStoreSpec{
+			FeastProject: feastProject,
+			Services: &feastdevv1alpha1.FeatureStoreServices{
+				OfflineStore: &feastdevv1alpha1.OfflineStore{},
+				OnlineStore: &feastdevv1alpha1.OnlineStore{
+					ServiceConfigs: feastdevv1alpha1.ServiceConfigs{
+						DefaultConfigs: feastdevv1alpha1.DefaultConfigs{
+							Image: &image,
+						},
+						OptionalConfigs: feastdevv1alpha1.OptionalConfigs{
+							Env:             envVars,
+							ImagePullPolicy: &pullPolicy,
+							Resources:       &corev1.ResourceRequirements{},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
 func getFeatureStoreYamlEnvVar(envs []corev1.EnvVar) *corev1.EnvVar {
 	for _, e := range envs {
 		if e.Name == services.FeatureStoreYamlEnvVar {
@@ -1130,3 +1222,25 @@ func getFeatureStoreYamlEnvVar(envs []corev1.EnvVar) *corev1.EnvVar {
 	}
 	return nil
 }
+
+func areEnvVarArraysEqual(arr1 []corev1.EnvVar, arr2 []corev1.EnvVar) bool {
+	if len(arr1) != len(arr2) {
+		return false
+	}
+
+	// Create a map to count occurrences of EnvVars in the first array.
+	envMap := make(map[string]string)
+
+	for _, env := range arr1 {
+		envMap[env.Name] = env.Value
+	}
+
+	// Check the second array against the map.
+	for _, env := range arr2 {
+		if val, exists := envMap[env.Name]; !exists || val != env.Value {
+			return false
+		}
+	}
+
+	return true
+}

infra/feast-operator/internal/controller/services/services.go

@@ -389,10 +389,35 @@ func (feast *FeastServices) deleteOwnedFeastObj(obj client.Object) error {
 }
 
 func applyOptionalContainerConfigs(container *corev1.Container, optionalConfigs feastdevv1alpha1.OptionalConfigs) {
+	if optionalConfigs.Env != nil {
+		container.Env = mergeEnvVarsArrays(container.Env, optionalConfigs.Env)
+	}
 	if optionalConfigs.ImagePullPolicy != nil {
 		container.ImagePullPolicy = *optionalConfigs.ImagePullPolicy
 	}
 	if optionalConfigs.Resources != nil {
 		container.Resources = *optionalConfigs.Resources
 	}
 }
+
+func mergeEnvVarsArrays(envVars1 []corev1.EnvVar, envVars2 *[]corev1.EnvVar) []corev1.EnvVar {
+	merged := make(map[string]corev1.EnvVar)
+
+	// Add all env vars from the first array
+	for _, envVar := range envVars1 {
+		merged[envVar.Name] = envVar
+	}
+
+	// Add all env vars from the second array, overriding duplicates
+	for _, envVar := range *envVars2 {
+		merged[envVar.Name] = envVar
+	}
+
+	// Convert the map back to an array
+	result := make([]corev1.EnvVar, 0, len(merged))
+	for _, envVar := range merged {
+		result = append(result, envVar)
+	}
+
+	return result
+}