Skip to content

Commit 8a9709f

Browse files
pyalexpyalex
authored
Use feast core images from GCR instead of building them ourselves (#17)
1 parent 0b13f7c commit 8a9709f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+171
-153
lines changed

‎.github/workflows/complete.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on: [push, pull_request]
55
jobs:
66

77
build-push-docker-images-for-e2e-tests:
8-
runs-on: [self-hosted]
8+
runs-on: [ubuntu-latest]
99
strategy:
1010
matrix:
11-
component: [core, serving, jobservice, jupyter, ci]
11+
component: [jobservice, spark]
1212
env:
1313
GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha }}
1414
REGISTRY: gcr.io/kf-feast
@@ -17,10 +17,16 @@ jobs:
1717
- uses: actions/checkout@v2
1818
with:
1919
submodules: recursive
20+
- uses: actions/checkout@v2
21+
- uses: docker/setup-qemu-action@v1
22+
- name: Set up Docker Buildx
23+
uses: docker/setup-buildx-action@v1
2024
- uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
2125
with:
2226
version: '290.0.1'
2327
export_default_credentials: true
28+
project_id: ${{ secrets.GCP_PROJECT_ID }}
29+
service_account_key: ${{ secrets.GCP_SA_KEY }}
2430
- run: gcloud auth configure-docker --quiet
2531
- name: Get m2 cache
2632
run: |

‎.github/workflows/mirror.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ name: mirror
22

33
on:
44
push:
5-
branches:
6-
- '**'
5+
branches: master
6+
tags:
7+
- 'v*.*.*'
78

89
jobs:
910
mirror:

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.prow/config.yaml‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ in_repo_config:
77

88
plank:
99
job_url_prefix_config:
10-
"*": https://prow.feast.dev/view/gcs
10+
"*": https://prow.feast.ai/view/gcs
1111
pod_pending_timeout: 60m
1212
report_templates:
1313
'*': >-
@@ -70,30 +70,6 @@ tide:
7070

7171
presubmits:
7272
feast-dev/feast-spark:
73-
- name: test-end-to-end
74-
decorate: true
75-
always_run: true
76-
spec:
77-
containers:
78-
- image: gcr.io/kf-feast/feast-ci:latest
79-
command: ["infra/scripts/test-end-to-end.sh"]
80-
resources:
81-
requests:
82-
cpu: "6"
83-
memory: "6144Mi"
84-
env:
85-
- name: GOOGLE_APPLICATION_CREDENTIALS
86-
value: /etc/gcloud/service-account.json
87-
volumeMounts:
88-
- mountPath: /etc/gcloud/service-account.json
89-
name: service-account
90-
readOnly: true
91-
subPath: service-account.json
92-
volumes:
93-
- name: service-account
94-
secret:
95-
secretName: feast-service-account
96-
9773
- name: test-end-to-end-gcp
9874
decorate: true
9975
always_run: true
@@ -127,7 +103,7 @@ presubmits:
127103
spec:
128104
containers:
129105
- image: gcr.io/kf-feast/feast-ci:latest
130-
command: [ "infra/scripts/codebuild_runner.py", "--location-from-prow", "--project-name", "feast-ci-project" ]
106+
command: [ "infra/scripts/aws-runner.sh", "--location-from-prow", "--project-name", "feast-ci-project" ]
131107
resources:
132108
requests:
133109
cpu: "2"
@@ -152,12 +128,16 @@ presubmits:
152128
spec:
153129
containers:
154130
- image: gcr.io/kf-feast/feast-ci:latest
155-
command: [ "infra/scripts/codebuild_runner.py", "--location-from-prow", "--project-name", "feast-ci-sparkop-project" ]
131+
command: [ "infra/scripts/aws-runner.sh", "--location-from-prow", "--project-name", "feast-ci-sparkop-project" ]
156132
resources:
157133
requests:
158134
cpu: "2"
159135
memory: "2048Mi"
160136
env:
137+
- name: GOOGLE_APPLICATION_CREDENTIALS
138+
value: /etc/gcloud/service-account.json
139+
- name: DOCKER_REPOSITORY
140+
value: gcr.io/kf-feast
161141
- name: AWS_ACCESS_KEY_ID
162142
valueFrom:
163143
secretKeyRef:
@@ -170,6 +150,16 @@ presubmits:
170150
key: AWS_SECRET_ACCESS_KEY
171151
- name: AWS_DEFAULT_REGION
172152
value: us-west-2
153+
volumeMounts:
154+
- mountPath: /etc/gcloud/service-account.json
155+
name: service-account
156+
readOnly: true
157+
subPath: service-account.json
158+
volumes:
159+
- name: service-account
160+
secret:
161+
secretName: feast-service-account
162+
173163

174164
- name: test-end-to-end-azure
175165
decorate: true

‎Makefile‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
MVN := mvn ${MAVEN_EXTRA_OPTS}
22
ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
3-
SUBMODULE_DIR := deps/feast
43

54
# Make sure env vars are available to submakes
65
export
@@ -29,7 +28,6 @@ install-python-ci-dependencies:
2928

3029
# Supports feast-dev repo master branch
3130
install-python: install-python-ci-dependencies
32-
cd ${SUBMODULE_DIR}; make install-python
3331
cd ${ROOT_DIR}; python -m pip install -e python
3432

3533
lint-python:
@@ -57,11 +55,3 @@ push-spark-docker:
5755
docker push $(REGISTRY)/feast-spark:$(VERSION)
5856

5957
install-ci-dependencies: install-python-ci-dependencies
60-
61-
# Forward all other build-X and push-X targets to the Makefile that knows how to build docker
62-
# containers
63-
build-%:
64-
cd ${SUBMODULE_DIR} && $(MAKE) $@
65-
66-
push-%:
67-
cd ${SUBMODULE_DIR} && $(MAKE) $@

‎deps/feast‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

infra/charts/feast/.helmignore renamed to infra/charts/feast-spark/.helmignore

File renamed without changes.

infra/charts/feast/Chart.yaml renamed to infra/charts/feast-spark/Chart.yaml

File renamed without changes.

infra/charts/feast/README.md renamed to infra/charts/feast-spark/README.md

File renamed without changes.

infra/charts/feast/README.md.gotmpl renamed to infra/charts/feast-spark/README.md.gotmpl

File renamed without changes.

0 commit comments

Comments
 (0)