Skip to content

Commit

Permalink
Merge branch 'feast-dev:master' into remote_apply
Browse files Browse the repository at this point in the history
  • Loading branch information
dmartinol authored Oct 1, 2024
2 parents c529466 + 30603a2 commit db72628
Show file tree
Hide file tree
Showing 56 changed files with 144 additions and 129 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/java_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
- synchronize
- labeled

permissions:
pull-requests: read

jobs:
lint-java:
# when using pull_request_target, all jobs MUST have this if check for 'ok-to-test' or 'approved' for security purposes.
Expand All @@ -23,6 +26,7 @@ jobs:
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
submodules: recursive
persist-credentials: false
- name: Lint java
run: make lint-java

Expand All @@ -42,6 +46,7 @@ jobs:
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
submodules: recursive
persist-credentials: false
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
Expand Down Expand Up @@ -84,6 +89,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'true'
persist-credentials: false
- name: Setup Python
uses: actions/setup-python@v5
id: setup-python
Expand Down Expand Up @@ -120,6 +126,7 @@ jobs:
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
submodules: recursive
persist-credentials: false
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/lint_pr.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
name: lint-pr

on:
pull_request_target:
pull_request:
types:
- opened
- edited
- synchronize

permissions:
# read-only perms specified due to use of pull_request_target in lieu of security label check
pull-requests: read

jobs:
validate-title:
if:
github.repository == 'feast-dev/feast'
github.event.pull_request.base.repo.full_name == 'feast-dev/feast'
name: Validate PR title
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pr_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
#concurrency:
# group: pr-integration-tests-${{ github.event.pull_request.number }}
# cancel-in-progress: true
permissions:
actions: write
pull-requests: read

jobs:
integration-test-python:
Expand Down Expand Up @@ -46,6 +49,7 @@ jobs:
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
submodules: recursive
persist-credentials: false
- name: Setup Python
uses: actions/setup-python@v5
id: setup-python
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pr_local_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@ name: pr-local-integration-tests
# This runs local tests with containerized stubs of online stores. This is the main dev workflow

on:
pull_request_target:
pull_request:
types:
- opened
- synchronize
- labeled

jobs:
integration-test-python-local:
# when using pull_request_target, all jobs MUST have this if check for 'ok-to-test' or 'approved' for security purposes.
if:
((github.event.action == 'labeled' && (github.event.label.name == 'approved' || github.event.label.name == 'lgtm' || github.event.label.name == 'ok-to-test')) ||
(github.event.action != 'labeled' && (contains(github.event.pull_request.labels.*.name, 'ok-to-test') || contains(github.event.pull_request.labels.*.name, 'approved') || contains(github.event.pull_request.labels.*.name, 'lgtm')))) &&
github.repository == 'feast-dev/feast'
github.event.pull_request.base.repo.full_name == 'feast-dev/feast'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -27,10 +26,9 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
# pull_request_target runs the workflow in the context of the base repo
# as such actions/checkout needs to be explicit configured to retrieve
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
repository: ${{ github.event.repository.full_name }} # Uses the full repository name
ref: ${{ github.ref }} # Uses the ref from the event
token: ${{ secrets.GITHUB_TOKEN }} # Automatically provided token
submodules: recursive
- name: Setup Python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .releaserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions docs/getting-started/architecture/model-inference.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Feature Serving and Model Inference

![](../../assets/feast_model_inference_architecture.png)


{% hint style="info" %}
**Note:** this ML Infrastructure diagram highlights an orchestration pattern that is driven by a client application.
This is not the only approach that can be taken and different patterns will result in different trade-offs.
{% endhint %}

Production machine learning systems can choose from four approaches to serving machine learning predictions (the output
of model inference):
1. Online model inference with online features
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to-guides/running-feast-in-production.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ helm install feast-release feast-charts/feast-feature-server \

This will deploy a single service. The service must have read access to the registry file on cloud storage and to the online store (e.g. via [podAnnotations](https://kubernetes-on-aws.readthedocs.io/en/latest/user-guide/iam-roles.html)). It will keep a copy of the registry in their memory and periodically refresh it, so expect some delays in update propagation in exchange for better performance.

> Alternatively, deploy the same helm chart with a [Kubernetes Operator](/infra/feast-operator).
> Alternatively, deploy the same helm chart with a [Kubernetes Operator](/infra/feast-helm-operator).
## 5. Using environment variables in your yaml configuration

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/alpha-vector-database.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ registry:
path: postgresql://@localhost:5432/feast
online_store:
type: postgres
pgvector_enabled: true
vector_enabled: true
vector_len: 384
host: 127.0.0.1
port: 5432
Expand Down
7 changes: 5 additions & 2 deletions docs/reference/alpha-web-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,14 @@ Start with bootstrapping a React app with `create-react-app`
npx create-react-app your-feast-ui
```

Then, in your app folder, install Feast UI and its peer dependencies. Assuming you use yarn
Then, in your app folder, install Feast UI and optionally its peer dependencies. Assuming you use yarn

```
yarn add @feast-dev/feast-ui
yarn add @elastic/eui @elastic/datemath @emotion/react moment prop-types inter-ui react-query react-router-dom use-query-params zod typescript query-string d3 @types/d3
# For custom UI using the Elastic UI Framework (optional):
yarn add @elastic/eui
# For general custom styling (optional):
yarn add @emotion/react
```

Edit `index.js` in the React app to use Feast UI.
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/online-stores/postgres.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ online_store:
sslkey_path: /path/to/client-key.pem
sslcert_path: /path/to/client-cert.pem
sslrootcert_path: /path/to/server-ca.pem
pgvector_enabled: false
vector_enabled: false
vector_len: 512
```
{% endcode %}
Expand Down Expand Up @@ -65,7 +65,7 @@ To compare this set of functionality against other online stores, please see the
## PGVector
The Postgres online store supports the use of [PGVector](https://github.com/pgvector/pgvector) for storing feature values.
To enable PGVector, set `pgvector_enabled: true` in the online store configuration.
To enable PGVector, set `vector_enabled: true` in the online store configuration.

The `vector_len` parameter can be used to specify the length of the vector. The default value is 512.

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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>)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
4 changes: 2 additions & 2 deletions infra/scripts/release/files_to_bump.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit db72628

Please sign in to comment.