Skip to content

Commit 9152d60

Browse files
franciscojavierarceofranciscojavierarceo
committed
removing changes outside of actions
Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>
1 parent 8d43d32 commit 9152d60

9 files changed

Lines changed: 20 additions & 16 deletions

File tree

‎.releaserc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module.exports = {
4141
"verifyReleaseCmd": "./infra/scripts/validate-release.sh ${nextRelease.type} " + current_branch,
4242

4343
// Bump all version files and build UI / update yarn.lock / helm charts
44-
"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"
44+
"prepareCmd": "python ./infra/scripts/release/bump_file_versions.py ${lastRelease.version} ${nextRelease.version}; make build-ui; make build-helm-docs"
4545
}],
4646

4747
["@semantic-release/release-notes-generator", {

‎infra/feast-operator/dist/install.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3580,10 +3580,10 @@ spec:
35803580
- /manager
35813581
env:
35823582
- name: RELATED_IMAGE_FEATURE_SERVER
3583-
value: docker.io/feastdev/feature-server:0.43.0
3583+
value: docker.io/feastdev/feature-server:0.42.0
35843584
- name: RELATED_IMAGE_GRPC_CURL
35853585
value: docker.io/fullstorydev/grpcurl:v1.9.1-alpine
3586-
image: feastdev/feast-operator:0.43.0
3586+
image: feastdev/feast-operator:0.42.0
35873587
livenessProbe:
35883588
httpGet:
35893589
path: /healthz

‎infra/feast-operator/internal/controller/services/services_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ import (
2525
)
2626

2727
const (
28-
feastServerImageVar = "RELATED_IMAGE_FEATURE_SERVER"
29-
grpcCurlImageVar = "RELATED_IMAGE_GRPC_CURL"
30-
grpcCurlImage = "fullstorydev/grpcurl:v1.9.1-alpine"
31-
3228
TmpFeatureStoreYamlEnvVar = "TMP_FEATURE_STORE_YAML_BASE64"
3329
FeatureStoreYamlCmKey = "feature_store.yaml"
3430
EphemeralPath = "/feast-data"

‎infra/feast-operator/internal/controller/services/util.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,17 @@ func setServiceDefaultConfigs(defaultConfigs *feastdevv1alpha1.DefaultConfigs) {
172172
}
173173

174174
func getFeatureServerImage() string {
175-
if img, exists := os.LookupEnv(feastServerImageVar); exists {
175+
if img, exists := os.LookupEnv("RELATED_IMAGE_FEATURE_SERVER"); exists {
176176
return img
177177
}
178178
return DefaultImage
179179
}
180180

181181
func getGrpcCurlImage() string {
182-
if img, exists := os.LookupEnv(grpcCurlImageVar); exists {
182+
if img, exists := os.LookupEnv("RELATED_IMAGE_GRPC_CURL"); exists {
183183
return img
184184
}
185-
return grpcCurlImage
185+
return "fullstorydev/grpcurl:v1.9.1-alpine"
186186
}
187187

188188
func checkOfflineStoreFilePersistenceType(value string) error {

‎infra/feast-operator/test/e2e/e2e_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ var _ = Describe("controller", Ordered, func() {
7575
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7676

7777
By("deploying the controller-manager")
78-
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage), fmt.Sprintf("FS_IMG=%s", feastLocalImage))
78+
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))
7979
_, err = utils.Run(cmd)
8080
ExpectWithOffset(1, err).NotTo(HaveOccurred())
8181

‎infra/feast-operator/test/e2e/test_util.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func checkIfKubernetesServiceExists(namespace, serviceName string) error {
158158

159159
func isFeatureStoreHavingRemoteRegistry(namespace, featureStoreName string) (bool, error) {
160160
cmd := exec.Command("kubectl", "get", "featurestore", featureStoreName, "-n", namespace,
161-
"-o=jsonpath='{.status.applied.services.registry}'")
161+
"-o=jsonpath='{.spec.services.registry}'")
162162

163163
// Capture the output
164164
output, err := cmd.Output()

‎infra/feast-operator/test/testdata/feast_integration_test_crs/v1alpha1_default_featurestore.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,10 @@ metadata:
55
spec:
66
feastProject: my_project
77
services:
8-
onlineStore: {}
9-
offlineStore: {}
8+
onlineStore:
9+
image: 'localhost/feastdev/feature-server:dev'
10+
offlineStore:
11+
image: 'localhost/feastdev/feature-server:dev'
12+
registry:
13+
local:
14+
image: 'localhost/feastdev/feature-server:dev'

‎infra/feast-operator/test/testdata/feast_integration_test_crs/v1alpha1_remote_registry_featurestore.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ metadata:
55
spec:
66
feastProject: my_project
77
services:
8-
onlineStore: {}
9-
offlineStore: {}
8+
onlineStore:
9+
image: 'localhost/feastdev/feature-server:dev'
10+
offlineStore:
11+
image: 'localhost/feastdev/feature-server:dev'
1012
registry:
1113
remote:
1214
feastRef:

‎infra/scripts/release/files_to_bump.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ infra/feast-helm-operator/Makefile 6
1414
infra/feast-helm-operator/config/manager/kustomization.yaml 8
1515
infra/feast-operator/Makefile 6
1616
infra/feast-operator/config/manager/kustomization.yaml 8
17+
infra/feast-operator/config/default/manager_related_images_patch.yaml 5
1718
infra/feast-operator/config/overlays/odh/params.env 1
1819
infra/feast-operator/api/feastversion/version.go 20
1920
java/pom.xml 38

0 commit comments

Comments
 (0)