removing changes outside of actions

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>
feast-dev · franciscojavierarceo · Jan 23, 2025 · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025
commit 9152d60d0ddc0be3daa3fc150e4d6c254dcbf7f3
diff --git a/.releaserc.js b/.releaserc.js
@@ -41,7 +41,7 @@ module.exports = {
             "verifyReleaseCmd": "./infra/scripts/validate-release.sh  ${nextRelease.type} " + current_branch,
 
             // Bump all version files and build UI / update yarn.lock / helm charts
-            "prepareCmd": "python ./infra/scripts/release/bump_file_versions.py ${lastRelease.version} ${nextRelease.version}; make build-ui; make build-helm-docs; make -C infra/feast-operator build-installer bundle"
+            "prepareCmd": "python ./infra/scripts/release/bump_file_versions.py ${lastRelease.version} ${nextRelease.version}; make build-ui; make build-helm-docs"
         }],
 
         ["@semantic-release/release-notes-generator", {

diff --git a/infra/feast-operator/dist/install.yaml b/infra/feast-operator/dist/install.yaml
@@ -3580,10 +3580,10 @@ spec:
         - /manager
         env:
         - name: RELATED_IMAGE_FEATURE_SERVER
-          value: docker.io/feastdev/feature-server:0.43.0
+          value: docker.io/feastdev/feature-server:0.42.0
         - name: RELATED_IMAGE_GRPC_CURL
           value: docker.io/fullstorydev/grpcurl:v1.9.1-alpine
-        image: feastdev/feast-operator:0.43.0
+        image: feastdev/feast-operator:0.42.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/infra/feast-operator/internal/controller/services/services_types.go b/infra/feast-operator/internal/controller/services/services_types.go
@@ -25,10 +25,6 @@ import (
 )
 
 const (
-	feastServerImageVar = "RELATED_IMAGE_FEATURE_SERVER"
-	grpcCurlImageVar    = "RELATED_IMAGE_GRPC_CURL"
-	grpcCurlImage       = "fullstorydev/grpcurl:v1.9.1-alpine"
-
 	TmpFeatureStoreYamlEnvVar = "TMP_FEATURE_STORE_YAML_BASE64"
 	FeatureStoreYamlCmKey     = "feature_store.yaml"
 	EphemeralPath             = "/feast-data"

diff --git a/infra/feast-operator/internal/controller/services/util.go b/infra/feast-operator/internal/controller/services/util.go
@@ -172,17 +172,17 @@ func setServiceDefaultConfigs(defaultConfigs *feastdevv1alpha1.DefaultConfigs) {
 }
 
 func getFeatureServerImage() string {
-	if img, exists := os.LookupEnv(feastServerImageVar); exists {
+	if img, exists := os.LookupEnv("RELATED_IMAGE_FEATURE_SERVER"); exists {
 		return img
 	}
 	return DefaultImage
 }
 
 func getGrpcCurlImage() string {
-	if img, exists := os.LookupEnv(grpcCurlImageVar); exists {
+	if img, exists := os.LookupEnv("RELATED_IMAGE_GRPC_CURL"); exists {
 		return img
 	}
-	return grpcCurlImage
+	return "fullstorydev/grpcurl:v1.9.1-alpine"
 }
 
 func checkOfflineStoreFilePersistenceType(value string) error {

diff --git a/infra/feast-operator/test/e2e/e2e_test.go b/infra/feast-operator/test/e2e/e2e_test.go
@@ -75,7 +75,7 @@ var _ = Describe("controller", Ordered, func() {
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
 
 		By("deploying the controller-manager")
-		cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage), fmt.Sprintf("FS_IMG=%s", feastLocalImage))
+		cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))
 		_, err = utils.Run(cmd)
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
 

diff --git a/infra/feast-operator/test/e2e/test_util.go b/infra/feast-operator/test/e2e/test_util.go
@@ -158,7 +158,7 @@ func checkIfKubernetesServiceExists(namespace, serviceName string) error {
 
 func isFeatureStoreHavingRemoteRegistry(namespace, featureStoreName string) (bool, error) {
 	cmd := exec.Command("kubectl", "get", "featurestore", featureStoreName, "-n", namespace,
-		"-o=jsonpath='{.status.applied.services.registry}'")
+		"-o=jsonpath='{.spec.services.registry}'")
 
 	// Capture the output
 	output, err := cmd.Output()

diff --git a/...east-operator/test/testdata/feast_integration_test_crs/v1alpha1_default_featurestore.yaml b/...east-operator/test/testdata/feast_integration_test_crs/v1alpha1_default_featurestore.yaml
@@ -5,5 +5,10 @@ metadata:
 spec:
   feastProject: my_project
   services:
-    onlineStore: {}
-    offlineStore: {}
+    onlineStore:
+      image: 'localhost/feastdev/feature-server:dev'
+    offlineStore:
+      image: 'localhost/feastdev/feature-server:dev'
+    registry:
+      local:
+        image: 'localhost/feastdev/feature-server:dev'
diff --git a/...rator/test/testdata/feast_integration_test_crs/v1alpha1_remote_registry_featurestore.yaml b/...rator/test/testdata/feast_integration_test_crs/v1alpha1_remote_registry_featurestore.yaml
@@ -5,8 +5,10 @@ metadata:
 spec:
   feastProject: my_project
   services:
-    onlineStore: {}
-    offlineStore: {}
+    onlineStore:
+      image: 'localhost/feastdev/feature-server:dev'
+    offlineStore:
+      image: 'localhost/feastdev/feature-server:dev'
     registry:
       remote:
         feastRef:

diff --git a/infra/scripts/release/files_to_bump.txt b/infra/scripts/release/files_to_bump.txt
@@ -14,6 +14,7 @@ infra/feast-helm-operator/Makefile 6
 infra/feast-helm-operator/config/manager/kustomization.yaml 8
 infra/feast-operator/Makefile 6
 infra/feast-operator/config/manager/kustomization.yaml 8
+infra/feast-operator/config/default/manager_related_images_patch.yaml 5
 infra/feast-operator/config/overlays/odh/params.env 1
 infra/feast-operator/api/feastversion/version.go 20
 java/pom.xml 38