Skip to content

chore: Revert 371 bump #4227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
franciscojavierarceo merged 3 commits into from
May 24, 2024
Merged

chore: Revert 371 bump #4227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f436d89
adjusting the validation for branch updates
franciscojavierarceo May 23, 2024
054eaca
updated to get parsed version
franciscojavierarceo May 24, 2024
c1d43d2
chore: Manually reverting version bumps
franciscojavierarceo May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/charts/feast-feature-server/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: feast-feature-server
description: Feast Feature Server in Go or Python
type: application
version: 0.37.1
version: 0.37.0
keywords:
- machine learning
- big data
Expand Down
2 changes: 1 addition & 1 deletion infra/charts/feast-feature-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Feast Python / Go Feature Server Helm Charts

Current chart version is `0.37.1`
Current chart version is `0.37.0`

## Installation

Expand Down
2 changes: 1 addition & 1 deletion infra/charts/feast-feature-server/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ image:
repository: feastdev/feature-server
pullPolicy: IfNotPresent
# image.tag -- The Docker image tag (can be overwritten if custom feature server deps are needed for on demand transforms)
tag: 0.37.1
tag: 0.37.0

imagePullSecrets: []
nameOverride: ""
Expand Down
2 changes: 1 addition & 1 deletion infra/charts/feast/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Feature store for machine learning
name: feast
version: 0.37.1
version: 0.37.0
keywords:
- machine learning
- big data
Expand Down
6 changes: 3 additions & 3 deletions infra/charts/feast/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This repo contains Helm charts for Feast Java components that are being installe

## Chart: Feast

Feature store for machine learning Current chart version is `0.37.1`
Feature store for machine learning Current chart version is `0.37.0`

## Installation

Expand Down Expand Up @@ -65,8 +65,8 @@ See [here](https://github.com/feast-dev/feast/tree/master/examples/java-demo) fo
| Repository | Name | Version |
|------------|------|---------|
| https://charts.helm.sh/stable | redis | 10.5.6 |
| https://feast-helm-charts.storage.googleapis.com | feature-server(feature-server) | 0.37.1 |
| https://feast-helm-charts.storage.googleapis.com | transformation-service(transformation-service) | 0.37.1 |
| https://feast-helm-charts.storage.googleapis.com | feature-server(feature-server) | 0.37.0 |
| https://feast-helm-charts.storage.googleapis.com | transformation-service(transformation-service) | 0.37.0 |

## Values

Expand Down
4 changes: 2 additions & 2 deletions infra/charts/feast/charts/feature-server/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
description: "Feast Feature Server: Online feature serving service for Feast"
name: feature-server
version: 0.37.1
appVersion: v0.37.1
version: 0.37.0
appVersion: v0.37.0
keywords:
- machine learning
- big data
Expand Down
4 changes: 2 additions & 2 deletions infra/charts/feast/charts/feature-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# feature-server

![Version: 0.37.1](https://img.shields.io/badge/Version-0.37.1-informational?style=flat-square) ![AppVersion: v0.37.1](https://img.shields.io/badge/AppVersion-v0.37.1-informational?style=flat-square)
![Version: 0.37.0](https://img.shields.io/badge/Version-0.37.0-informational?style=flat-square) ![AppVersion: v0.37.0](https://img.shields.io/badge/AppVersion-v0.37.0-informational?style=flat-square)

Feast Feature Server: Online feature serving service for Feast

Expand All @@ -17,7 +17,7 @@ Feast Feature Server: Online feature serving service for Feast
| envOverrides | object | `{}` | Extra environment variables to set |
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.repository | string | `"feastdev/feature-server-java"` | Docker image for Feature Server repository |
| image.tag | string | `"0.37.1"` | Image tag |
| image.tag | string | `"0.37.0"` | Image tag |
| ingress.grpc.annotations | object | `{}` | Extra annotations for the ingress |
| ingress.grpc.auth.enabled | bool | `false` | Flag to enable auth |
| ingress.grpc.class | string | `"nginx"` | Which ingress controller to use |
Expand Down
2 changes: 1 addition & 1 deletion infra/charts/feast/charts/feature-server/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image:
# image.repository -- Docker image for Feature Server repository
repository: feastdev/feature-server-java
# image.tag -- Image tag
tag: 0.37.1
tag: 0.37.0
# image.pullPolicy -- Image pull policy
pullPolicy: IfNotPresent

Expand Down
4 changes: 2 additions & 2 deletions infra/charts/feast/charts/transformation-service/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
description: "Transformation service: to compute on-demand features"
name: transformation-service
version: 0.37.1
appVersion: v0.37.1
version: 0.37.0
appVersion: v0.37.0
keywords:
- machine learning
- big data
Expand Down
4 changes: 2 additions & 2 deletions infra/charts/feast/charts/transformation-service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# transformation-service

![Version: 0.37.1](https://img.shields.io/badge/Version-0.37.1-informational?style=flat-square) ![AppVersion: v0.37.1](https://img.shields.io/badge/AppVersion-v0.37.1-informational?style=flat-square)
![Version: 0.37.0](https://img.shields.io/badge/Version-0.37.0-informational?style=flat-square) ![AppVersion: v0.37.0](https://img.shields.io/badge/AppVersion-v0.37.0-informational?style=flat-square)

Transformation service: to compute on-demand features

Expand All @@ -13,7 +13,7 @@ Transformation service: to compute on-demand features
| envOverrides | object | `{}` | Extra environment variables to set |
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.repository | string | `"feastdev/feature-transformation-server"` | Docker image for Transformation Server repository |
| image.tag | string | `"0.37.1"` | Image tag |
| image.tag | string | `"0.37.0"` | Image tag |
| nodeSelector | object | `{}` | Node labels for pod assignment |
| podLabels | object | `{}` | Labels to be added to Feast Serving pods |
| replicaCount | int | `1` | Number of pods that will be created |
Expand Down
2 changes: 1 addition & 1 deletion infra/charts/feast/charts/transformation-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image:
# image.repository -- Docker image for Transformation Server repository
repository: feastdev/feature-transformation-server
# image.tag -- Image tag
tag: 0.37.1
tag: 0.37.0
# image.pullPolicy -- Image pull policy
pullPolicy: IfNotPresent

Expand Down
4 changes: 2 additions & 2 deletions infra/charts/feast/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: feature-server
alias: feature-server
version: 0.37.1
version: 0.37.0
condition: feature-server.enabled
repository: https://feast-helm-charts.storage.googleapis.com
- name: transformation-service
alias: transformation-service
version: 0.37.1
version: 0.37.0
condition: transformation-service.enabled
repository: https://feast-helm-charts.storage.googleapis.com
- name: redis
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.37.1
VERSION ?= 0.37.0

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: feastdev/feast-operator
newTag: 0.37.1
newTag: 0.37.0
15 changes: 13 additions & 2 deletions infra/scripts/release/bump_file_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# This script will bump the versions found in files (charts, pom.xml) during the Feast release process.

import re
import pathlib
import sys

Expand Down Expand Up @@ -45,7 +46,9 @@ def main() -> None:
with open(repo_root.joinpath(file_path), "r") as f:
file_contents = f.readlines()
for line in lines:
file_contents[int(line) - 1] = file_contents[int(line) - 1].replace(current_version, new_version)
# note we validate the version above already
current_parsed_version = _get_semantic_version(file_contents[int(line) - 1])
file_contents[int(line) - 1] = file_contents[int(line) - 1].replace(current_parsed_version, new_version)

with open(repo_root.joinpath(file_path), "w") as f:
f.write(''.join(file_contents))
Expand Down Expand Up @@ -73,11 +76,19 @@ def validate_files_to_bump(current_version, files_to_bump, repo_root):
with open(repo_root.joinpath(file_path), "r") as f:
file_contents = f.readlines()
for line in lines:
assert current_version in file_contents[int(line) - 1], (
new_version = _get_semantic_version(file_contents[int(line) - 1])
current_major_minor_version = '.'.join(current_version.split(".")[0:1])
assert current_version in new_version or current_major_minor_version in new_version, (
f"File `{file_path}` line `{line}` didn't contain version {current_version}. "
f"Contents: {file_contents[int(line) - 1]}"
)


def _get_semantic_version(input_string: str) -> str:
semver_pattern = r'\bv?(\d+\.\d+\.\d+)\b'
match = re.search(semver_pattern, input_string)
return match.group(1)


if __name__ == "__main__":
main()
2 changes: 1 addition & 1 deletion java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</modules>

<properties>
<revision>0.37.1</revision>
<revision>0.37.0</revision>
<github.url>https://github.com/feast-dev/feast</github.url>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@feast-dev/feast-ui",
"version": "0.37.1",
"version": "0.37.0",
"private": false,
"files": [
"dist"
Expand Down