Merge branch 'master' into podfv2

Author: franciscojavierarceo

.github/workflows/publish.yml

@@ -49,7 +49,7 @@ jobs:
     needs: [get-version, publish-python-sdk]
     strategy:
       matrix:
-        component: [feature-server, feature-server-java, feature-transformation-server, feast-operator]
+        component: [feature-server, feature-server-java, feature-transformation-server, feast-helm-operator]
     env:
       MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
       REGISTRY: feastdev

.releaserc.js

@@ -66,7 +66,7 @@ module.exports = {
                     "CHANGELOG.md",
                     "java/pom.xml",
                     "infra/charts/**/*.*",
-                    "infra/feast-operator/**/*",
+                    "infra/feast-helm-operator/**/*",
                     "ui/package.json",
                     "sdk/python/feast/ui/package.json",
                     "sdk/python/feast/ui/yarn.lock"

Makefile

@@ -430,15 +430,15 @@ build-feature-server-java-docker:
 		-t $(REGISTRY)/feature-server-java:$(VERSION) \
 		-f java/infra/docker/feature-server/Dockerfile --load .
 
-push-feast-operator-docker:
-	cd infra/feast-operator && \
-	IMAGE_TAG_BASE=$(REGISTRY)/feast-operator \
+push-feast-helm-operator-docker:
+	cd infra/feast-helm-operator && \
+	IMAGE_TAG_BASE=$(REGISTRY)/feast-helm-operator \
 	VERSION=$(VERSION) \
 	$(MAKE) docker-push
 
-build-feast-operator-docker:
-	cd infra/feast-operator && \
-	IMAGE_TAG_BASE=$(REGISTRY)/feast-operator \
+build-feast-helm-operator-docker:
+	cd infra/feast-helm-operator && \
+	IMAGE_TAG_BASE=$(REGISTRY)/feast-helm-operator \
 	VERSION=$(VERSION) \
 	$(MAKE) docker-build
 

docs/getting-started/quickstart.md

@@ -28,8 +28,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # This variable is used to construct full image tags for bundle and catalog images.
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# feastdev/feast-operator-bundle:$VERSION and feastdev/feast-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= feastdev/feast-operator
+# feastdev/feast-helm-operator-bundle:$VERSION and feastdev/feast-helm-operator-catalog:$VERSION.
+IMAGE_TAG_BASE ?= feastdev/feast-helm-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>)

docs/how-to-guides/running-feast-in-production.md

@@ -8,7 +8,7 @@ layout:
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
-projectName: feast-operator
+projectName: feast-helm-operator
 resources:
 - api:
     crdVersion: v1

infra/feast-operator/.gitignore renamed to infra/feast-helm-operator/.gitignore

@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: feast-operator-system
+namespace: feast-helm-operator-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: feast-operator-
+namePrefix: feast-helm-operator-
 
 # Labels to add to all resources and selectors.
 #labels:

infra/feast-operator/Dockerfile renamed to infra/feast-helm-operator/Dockerfile

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

infra/feast-operator/Makefile renamed to infra/feast-helm-operator/Makefile

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: namespace
     app.kubernetes.io/instance: system
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
@@ -21,8 +21,8 @@ metadata:
     app.kubernetes.io/name: deployment
     app.kubernetes.io/instance: controller-manager
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
@@ -68,7 +68,7 @@ spec:
       containers:
       - args:
         - --leader-elect
-        - --leader-election-id=feast-operator
+        - --leader-election-id=feast-helm-operator
         image: controller:latest
         name: manager
         securityContext:

infra/feast-operator/PROJECT renamed to infra/feast-helm-operator/PROJECT

@@ -1,7 +1,7 @@
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
-- bases/feast-operator.clusterserviceversion.yaml
+- bases/feast-helm-operator.clusterserviceversion.yaml
 - ../default
 - ../samples
 - ../scorecard

infra/feast-operator/README.md renamed to infra/feast-helm-operator/README.md

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: feastfeatureserver-editor-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: feastfeatureserver-editor-role
 rules:

infra/feast-operator/config/crd/bases/charts.feast.dev_feastfeatureservers.yaml renamed to infra/feast-helm-operator/config/crd/bases/charts.feast.dev_feastfeatureservers.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: feastfeatureserver-editor-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: feastfeatureserver-editor-rolebinding
 roleRef:

infra/feast-operator/config/crd/kustomization.yaml renamed to infra/feast-helm-operator/config/crd/kustomization.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: role
     app.kubernetes.io/instance: leader-election-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: leader-election-role
 rules:

infra/feast-operator/config/default/kustomization.yaml renamed to infra/feast-helm-operator/config/default/kustomization.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: rolebinding
     app.kubernetes.io/instance: leader-election-rolebinding
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: leader-election-rolebinding
 roleRef:

infra/feast-operator/config/manager/kustomization.yaml renamed to infra/feast-helm-operator/config/manager/kustomization.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: manager-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: manager-role
 rules:

infra/feast-operator/config/manager/manager.yaml renamed to infra/feast-helm-operator/config/manager/manager.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrolebinding
     app.kubernetes.io/instance: manager-rolebinding
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: manager-rolebinding
 roleRef:

infra/feast-operator/config/manifests/kustomization.yaml renamed to infra/feast-helm-operator/config/manifests/kustomization.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: serviceaccount
     app.kubernetes.io/instance: controller-manager-sa
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: feast-operator
-    app.kubernetes.io/part-of: feast-operator
+    app.kubernetes.io/created-by: feast-helm-operator
+    app.kubernetes.io/part-of: feast-helm-operator
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager
   namespace: system

infra/feast-operator/config/rbac/feastfeatureserver_editor_role.yaml renamed to infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_role.yaml

@@ -10,7 +10,7 @@ infra/charts/feast/README.md 11 68 69
 infra/charts/feast-feature-server/Chart.yaml 5
 infra/charts/feast-feature-server/README.md 3
 infra/charts/feast-feature-server/values.yaml 12
-infra/feast-operator/Makefile 6
-infra/feast-operator/config/manager/kustomization.yaml 8
+infra/feast-helm-operator/Makefile 6
+infra/feast-helm-operator/config/manager/kustomization.yaml 8
 java/pom.xml 38
 ui/package.json 3

infra/feast-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml renamed to infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml

@@ -49,6 +49,10 @@
     name=DUMMY_ENTITY_NAME,
     join_keys=[DUMMY_ENTITY_ID],
 )
+DUMMY_ENTITY_FIELD = Field(
+    name=DUMMY_ENTITY_ID,
+    dtype=from_value_type(ValueType.STRING),
+)
 
 
 @typechecked

infra/feast-operator/config/rbac/kustomization.yaml renamed to infra/feast-helm-operator/config/rbac/kustomization.yaml

@@ -1,7 +1,7 @@
-FROM python:3.11-slim-bullseye AS build
+FROM debian:11-slim AS build
 
 RUN apt-get update && \
-    apt-get install --no-install-suggests --no-install-recommends --yes git
+    apt-get install --no-install-suggests --no-install-recommends --yes git python3 python3-pip
 
 WORKDIR /app
 

infra/feast-operator/config/rbac/leader_election_role.yaml renamed to infra/feast-helm-operator/config/rbac/leader_election_role.yaml

@@ -47,7 +47,10 @@ class SnowflakeMaterializationEngineConfig(FeastConfigBaseModel):
     """ Type selector"""
 
     config_path: Optional[str] = os.path.expanduser("~/.snowsql/config")
-    """ Snowflake config path -- absolute path required (Cant use ~)"""
+    """ Snowflake snowsql config path -- absolute path required (Cant use ~)"""
+
+    connection_name: Optional[str] = None
+    """ Snowflake connector connection name -- typically defined in ~/.snowflake/connections.toml """
 
     account: Optional[str] = None
     """ Snowflake deployment identifier -- drop .snowflakecomputing.com"""

infra/feast-operator/config/rbac/leader_election_role_binding.yaml renamed to infra/feast-helm-operator/config/rbac/leader_election_role_binding.yaml

@@ -30,7 +30,6 @@
     RetrievalMetadata,
 )
 from feast.infra.registry.base_registry import BaseRegistry
-from feast.infra.utils import aws_utils
 from feast.repo_config import FeastConfigBaseModel, RepoConfig
 from feast.saved_dataset import SavedDatasetStorage
 from feast.type_map import spark_schema_to_np_dtypes
@@ -399,6 +398,8 @@ def to_remote_storage(self) -> List[str]:
 
                 return _list_files_in_folder(output_uri)
             elif self._config.offline_store.staging_location.startswith("s3://"):
+                from feast.infra.utils import aws_utils
+
                 spark_compatible_s3_staging_location = (
                     self._config.offline_store.staging_location.replace(
                         "s3://", "s3a://"

infra/feast-operator/config/rbac/role.yaml renamed to infra/feast-helm-operator/config/rbac/role.yaml

@@ -83,7 +83,10 @@ class SnowflakeOfflineStoreConfig(FeastConfigBaseModel):
     """ Offline store type selector """
 
     config_path: Optional[str] = os.path.expanduser("~/.snowsql/config")
-    """ Snowflake config path -- absolute path required (Cant use ~)"""
+    """ Snowflake snowsql config path -- absolute path required (Cant use ~)"""
+
+    connection_name: Optional[str] = None
+    """ Snowflake connector connection name -- typically defined in ~/.snowflake/connections.toml """
 
     account: Optional[str] = None
     """ Snowflake deployment identifier -- drop .snowflakecomputing.com """

infra/feast-operator/config/rbac/role_binding.yaml renamed to infra/feast-helm-operator/config/rbac/role_binding.yaml

@@ -30,7 +30,10 @@ class SnowflakeOnlineStoreConfig(FeastConfigBaseModel):
     """ Online store type selector """
 
     config_path: Optional[str] = os.path.expanduser("~/.snowsql/config")
-    """ Snowflake config path -- absolute path required (Can't use ~)"""
+    """ Snowflake snowsql config path -- absolute path required (Cant use ~)"""
+
+    connection_name: Optional[str] = None
+    """ Snowflake connector connection name -- typically defined in ~/.snowflake/connections.toml """
 
     account: Optional[str] = None
     """ Snowflake deployment identifier -- drop .snowflakecomputing.com """

infra/feast-operator/config/rbac/service_account.yaml renamed to infra/feast-helm-operator/config/rbac/service_account.yaml

@@ -80,7 +80,10 @@ class SnowflakeRegistryConfig(RegistryConfig):
     """ Registry type selector """
 
     config_path: Optional[str] = os.path.expanduser("~/.snowsql/config")
-    """ Snowflake config path -- absolute path required (Cant use ~) """
+    """ Snowflake snowsql config path -- absolute path required (Cant use ~)"""
+
+    connection_name: Optional[str] = None
+    """ Snowflake connector connection name -- typically defined in ~/.snowflake/connections.toml """
 
     account: Optional[str] = None
     """ Snowflake deployment identifier -- drop .snowflakecomputing.com """

infra/feast-operator/config/samples/charts_v1alpha1_feastfeatureserver.yaml renamed to infra/feast-helm-operator/config/samples/charts_v1alpha1_feastfeatureserver.yaml

@@ -17,6 +17,7 @@
     RequestSource,
 )
 from feast.driver_test_data import create_driver_hourly_stats_df
+from feast.feature_view import DUMMY_ENTITY_FIELD
 from feast.field import Field
 from feast.infra.online_stores.sqlite import SqliteOnlineStoreConfig
 from feast.on_demand_feature_view import on_demand_feature_view
@@ -29,6 +30,8 @@
     String,
     UnixTimestamp,
     _utc_now,
+    ValueType,
+    from_value_type,
 )
 
 
@@ -60,7 +63,9 @@ def setUp(self):
                 path=driver_stats_path, allow_truncated_timestamps=True
             )
 
-            driver = Entity(name="driver", join_keys=["driver_id"])
+            driver = Entity(
+                name="driver", join_keys=["driver_id"], value_type=ValueType.INT64
+            )
 
             driver_stats_source = FileSource(
                 name="driver_hourly_stats_source",
@@ -82,6 +87,19 @@ def setUp(self):
                 source=driver_stats_source,
             )
 
+            driver_stats_entity_less_fv = FeatureView(
+                name="driver_hourly_stats_no_entity",
+                entities=[],
+                ttl=timedelta(days=0),
+                schema=[
+                    Field(name="conv_rate", dtype=Float32),
+                    Field(name="acc_rate", dtype=Float32),
+                    Field(name="avg_daily_trips", dtype=Int64),
+                ],
+                online=True,
+                source=driver_stats_source,
+            )
+
             @on_demand_feature_view(
                 sources=[driver_stats_fv],
                 schema=[Field(name="conv_rate_plus_acc_pandas", dtype=Float64)],
@@ -160,6 +178,7 @@ def python_singleton_view(inputs: dict[str, Any]) -> dict[str, Any]:
                         pandas_view,
                         python_view,
                         python_singleton_view,
+                        driver_stats_entity_less_fv,
                     ]
                 )
 
@@ -171,13 +190,19 @@ def python_singleton_view(inputs: dict[str, Any]) -> dict[str, Any]:
                     pandas_view,
                     python_view,
                     python_demo_view,
+                    driver_stats_entity_less_fv,
                 ]
             )
             self.store.write_to_online_store(
                 feature_view_name="driver_hourly_stats", df=driver_df
             )
-            assert len(self.store.list_all_feature_views()) == 4
-            assert len(self.store.list_feature_views()) == 1
+            assert driver_stats_fv.entity_columns == [
+                Field(name=driver.join_key, dtype=from_value_type(driver.value_type))
+            ]
+            assert driver_stats_entity_less_fv.entity_columns == [DUMMY_ENTITY_FIELD]
+
+            assert len(self.store.list_all_feature_views()) == 5
+            assert len(self.store.list_feature_views()) == 2
             assert len(self.store.list_on_demand_feature_views()) == 3
             assert len(self.store.list_stream_feature_views()) == 0