From f436d89781276e58d6430a2aac6b19fb3c030005 Mon Sep 17 00:00:00 2001 From: Francisco Javier Arceo Date: Thu, 23 May 2024 15:04:28 -0400 Subject: [PATCH 1/3] adjusting the validation for branch updates Signed-off-by: Francisco Javier Arceo --- infra/scripts/release/bump_file_versions.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/infra/scripts/release/bump_file_versions.py b/infra/scripts/release/bump_file_versions.py index e17463c2c7b..c7cfe26ce8b 100644 --- a/infra/scripts/release/bump_file_versions.py +++ b/infra/scripts/release/bump_file_versions.py @@ -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 @@ -73,11 +74,20 @@ 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() From 054eacac328598b0133bbc9b7b1c0c9e35eb7580 Mon Sep 17 00:00:00 2001 From: Francisco Javier Arceo Date: Fri, 24 May 2024 05:58:37 -0400 Subject: [PATCH 2/3] updated to get parsed version Signed-off-by: Francisco Javier Arceo --- infra/scripts/release/bump_file_versions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/infra/scripts/release/bump_file_versions.py b/infra/scripts/release/bump_file_versions.py index c7cfe26ce8b..c913e9f43f7 100644 --- a/infra/scripts/release/bump_file_versions.py +++ b/infra/scripts/release/bump_file_versions.py @@ -46,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)) @@ -82,7 +84,6 @@ def validate_files_to_bump(current_version, files_to_bump, repo_root): ) - def _get_semantic_version(input_string: str) -> str: semver_pattern = r'\bv?(\d+\.\d+\.\d+)\b' match = re.search(semver_pattern, input_string) From c1d43d280d74b9ff7484e59c3862971e861a761a Mon Sep 17 00:00:00 2001 From: Francisco Javier Arceo Date: Fri, 24 May 2024 06:02:05 -0400 Subject: [PATCH 3/3] chore: Manually reverting version bumps Signed-off-by: Francisco Javier Arceo --- infra/charts/feast-feature-server/Chart.yaml | 2 +- infra/charts/feast-feature-server/README.md | 2 +- infra/charts/feast-feature-server/values.yaml | 2 +- infra/charts/feast/Chart.yaml | 2 +- infra/charts/feast/README.md | 6 +++--- infra/charts/feast/charts/feature-server/Chart.yaml | 4 ++-- infra/charts/feast/charts/feature-server/README.md | 4 ++-- infra/charts/feast/charts/feature-server/values.yaml | 2 +- infra/charts/feast/charts/transformation-service/Chart.yaml | 4 ++-- infra/charts/feast/charts/transformation-service/README.md | 4 ++-- .../charts/feast/charts/transformation-service/values.yaml | 2 +- infra/charts/feast/requirements.yaml | 4 ++-- infra/feast-operator/Makefile | 2 +- infra/feast-operator/config/manager/kustomization.yaml | 2 +- java/pom.xml | 2 +- ui/package.json | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/infra/charts/feast-feature-server/Chart.yaml b/infra/charts/feast-feature-server/Chart.yaml index 8d564f3b420..bd4bc606a70 100644 --- a/infra/charts/feast-feature-server/Chart.yaml +++ b/infra/charts/feast-feature-server/Chart.yaml @@ -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 diff --git a/infra/charts/feast-feature-server/README.md b/infra/charts/feast-feature-server/README.md index a9c609c3d62..ceb8637b45b 100644 --- a/infra/charts/feast-feature-server/README.md +++ b/infra/charts/feast-feature-server/README.md @@ -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 diff --git a/infra/charts/feast-feature-server/values.yaml b/infra/charts/feast-feature-server/values.yaml index df5241ebb2d..0de071ef3db 100644 --- a/infra/charts/feast-feature-server/values.yaml +++ b/infra/charts/feast-feature-server/values.yaml @@ -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: "" diff --git a/infra/charts/feast/Chart.yaml b/infra/charts/feast/Chart.yaml index 21c00e4483b..26a00d80c63 100644 --- a/infra/charts/feast/Chart.yaml +++ b/infra/charts/feast/Chart.yaml @@ -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 diff --git a/infra/charts/feast/README.md b/infra/charts/feast/README.md index 8ab816dc707..47959047dc2 100644 --- a/infra/charts/feast/README.md +++ b/infra/charts/feast/README.md @@ -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 @@ -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 diff --git a/infra/charts/feast/charts/feature-server/Chart.yaml b/infra/charts/feast/charts/feature-server/Chart.yaml index 08563c6e069..f2f8c748dc4 100644 --- a/infra/charts/feast/charts/feature-server/Chart.yaml +++ b/infra/charts/feast/charts/feature-server/Chart.yaml @@ -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 diff --git a/infra/charts/feast/charts/feature-server/README.md b/infra/charts/feast/charts/feature-server/README.md index 3018b31c96c..531adce92da 100644 --- a/infra/charts/feast/charts/feature-server/README.md +++ b/infra/charts/feast/charts/feature-server/README.md @@ -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 @@ -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 | diff --git a/infra/charts/feast/charts/feature-server/values.yaml b/infra/charts/feast/charts/feature-server/values.yaml index 1d86059c1fd..1bf1a03f4a7 100644 --- a/infra/charts/feast/charts/feature-server/values.yaml +++ b/infra/charts/feast/charts/feature-server/values.yaml @@ -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 diff --git a/infra/charts/feast/charts/transformation-service/Chart.yaml b/infra/charts/feast/charts/transformation-service/Chart.yaml index bad9befa0bf..056e00473fb 100644 --- a/infra/charts/feast/charts/transformation-service/Chart.yaml +++ b/infra/charts/feast/charts/transformation-service/Chart.yaml @@ -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 diff --git a/infra/charts/feast/charts/transformation-service/README.md b/infra/charts/feast/charts/transformation-service/README.md index f912b4c02f7..4b11861d539 100644 --- a/infra/charts/feast/charts/transformation-service/README.md +++ b/infra/charts/feast/charts/transformation-service/README.md @@ -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 @@ -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 | diff --git a/infra/charts/feast/charts/transformation-service/values.yaml b/infra/charts/feast/charts/transformation-service/values.yaml index df5ea64c347..a04dfeb3e04 100644 --- a/infra/charts/feast/charts/transformation-service/values.yaml +++ b/infra/charts/feast/charts/transformation-service/values.yaml @@ -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 diff --git a/infra/charts/feast/requirements.yaml b/infra/charts/feast/requirements.yaml index 80b8c861326..9a2d3e0e807 100644 --- a/infra/charts/feast/requirements.yaml +++ b/infra/charts/feast/requirements.yaml @@ -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 diff --git a/infra/feast-operator/Makefile b/infra/feast-operator/Makefile index 84e69d6eaca..1388778f9fe 100644 --- a/infra/feast-operator/Makefile +++ b/infra/feast-operator/Makefile @@ -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") diff --git a/infra/feast-operator/config/manager/kustomization.yaml b/infra/feast-operator/config/manager/kustomization.yaml index be181e33472..226b87118d2 100644 --- a/infra/feast-operator/config/manager/kustomization.yaml +++ b/infra/feast-operator/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: feastdev/feast-operator - newTag: 0.37.1 + newTag: 0.37.0 diff --git a/java/pom.xml b/java/pom.xml index 8ba8ed4ac53..2d7e2c3e7d2 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -35,7 +35,7 @@ - 0.37.1 + 0.37.0 https://github.com/feast-dev/feast UTF-8 diff --git a/ui/package.json b/ui/package.json index ea69e571fb5..9209d7b03c7 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "@feast-dev/feast-ui", - "version": "0.37.1", + "version": "0.37.0", "private": false, "files": [ "dist"