Skip to content

Commit 75f5a90

Browse files
tchughesivtchughesiv
authored
fix: Increase available action VM storage and reduce dev feature-server image size (#5112)
1 parent a2f8ac3 commit 75f5a90

7 files changed

Lines changed: 45 additions & 41 deletions

File tree

‎.github/workflows/operator-e2e-integration-tests.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@ jobs:
3636
- name: Checkout code
3737
uses: actions/checkout@v4
3838

39+
- name: Free Disk Space (Ubuntu)
40+
uses: jlumbroso/[email protected]
41+
with:
42+
android: true
43+
dotnet: true
44+
haskell: true
45+
large-packages: false
46+
docker-images: false
47+
swap-storage: false
48+
tool-cache: false
49+
3950
- name: Set up Go
4051
uses: actions/setup-go@v5
4152
with:
@@ -49,7 +60,7 @@ jobs:
4960
nodes:
5061
- role: control-plane
5162
extraMounts:
52-
- hostPath: /tmp/kind
63+
- hostPath: /mnt/kind
5364
containerPath: /var/lib/containerd
5465
EOF
5566
@@ -64,12 +75,6 @@ jobs:
6475
cd infra/feast-operator/
6576
make test-e2e
6677
67-
- name: Clean up docker images
68-
if: always()
69-
run: |
70-
docker images --format '{{.Repository}}:{{.Tag}}' | grep 'feast' | xargs -r docker rmi -f
71-
docker system prune -a -f
72-
7378
- name: Run Previous version tests
7479
run: |
7580
# Run the previous version tests

‎Makefile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -554,12 +554,6 @@ build-feast-operator-docker:
554554

555555
# Dev images
556556

557-
build-feature-server-dev-minimal:
558-
docker buildx build \
559-
-t feastdev/feature-server:dev \
560-
-f sdk/python/feast/infra/feature_servers/multicloud/Dockerfile \
561-
--load sdk/python/feast/infra/feature_servers/multicloud
562-
563557
build-feature-server-dev:
564558
docker buildx build \
565559
-t feastdev/feature-server:dev \

‎infra/feast-operator/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ docker-build: ## Build docker image with the manager.
162162
## Build feast docker image.
163163
.PHONY: feast-ci-dev-docker-img
164164
feast-ci-dev-docker-img:
165-
cd ./../.. && make build-feature-server-dev-minimal
166-
165+
cd ./../.. && make build-feature-server-dev
167166

168167
.PHONY: docker-push
169168
docker-push: ## Push docker image with the manager.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var _ = Describe("controller", Ordered, func() {
4040
featureStoreName, feastResourceName, feastK8sResourceNames)
4141

4242
BeforeAll(func() {
43-
utils.DeployOperatorFromCode("/test/e2e")
43+
utils.DeployOperatorFromCode("/test/e2e", false)
4444
})
4545

4646
AfterAll(func() {

‎infra/feast-operator/test/upgrade/upgrade_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
var _ = Describe("operator upgrade", Ordered, func() {
2525
BeforeAll(func() {
2626
utils.DeployPreviousVersionOperator()
27-
utils.DeployOperatorFromCode("/test/e2e")
27+
utils.DeployOperatorFromCode("/test/e2e", true)
2828
})
2929

3030
AfterAll(func() {

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ func fixRemoteFeastK8sResourceNames(feastK8sResourceNames []string, remoteFeastR
350350
}
351351

352352
// DeployOperatorFromCode - Creates the images for the operator and deploys it
353-
func DeployOperatorFromCode(testDir string) {
353+
func DeployOperatorFromCode(testDir string, skipBuilds bool) {
354354
_, isRunOnOpenShiftCI := os.LookupEnv("RUN_ON_OPENSHIFT_CI")
355355
if !isRunOnOpenShiftCI {
356356
By("creating manager namespace")
@@ -361,32 +361,34 @@ func DeployOperatorFromCode(testDir string) {
361361
// projectimage stores the name of the image used in the example
362362
var projectimage = "localhost/feast-operator:v0.0.1"
363363

364-
By("building the manager(Operator) image")
365-
cmd = exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", projectimage))
366-
_, err = Run(cmd, testDir)
367-
ExpectWithOffset(1, err).NotTo(HaveOccurred())
368-
369-
By("loading the the manager(Operator) image on Kind")
370-
err = LoadImageToKindClusterWithName(projectimage, testDir)
371-
ExpectWithOffset(1, err).NotTo(HaveOccurred())
372-
373364
// this image will be built in above make target.
374365
var feastImage = "feastdev/feature-server:dev"
375366
var feastLocalImage = "localhost/feastdev/feature-server:dev"
376367

377-
By("building the feast image")
378-
cmd = exec.Command("make", "feast-ci-dev-docker-img")
379-
_, err = Run(cmd, testDir)
380-
ExpectWithOffset(1, err).NotTo(HaveOccurred())
381-
382-
By("Tag the local feast image for the integration tests")
383-
cmd = exec.Command("docker", "image", "tag", feastImage, feastLocalImage)
384-
_, err = Run(cmd, testDir)
385-
ExpectWithOffset(1, err).NotTo(HaveOccurred())
386-
387-
By("loading the the feast image on Kind cluster")
388-
err = LoadImageToKindClusterWithName(feastLocalImage, testDir)
389-
ExpectWithOffset(1, err).NotTo(HaveOccurred())
368+
if !skipBuilds {
369+
By("building the manager(Operator) image")
370+
cmd = exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", projectimage))
371+
_, err = Run(cmd, testDir)
372+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
373+
374+
By("loading the the manager(Operator) image on Kind")
375+
err = LoadImageToKindClusterWithName(projectimage, testDir)
376+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
377+
378+
By("building the feast image")
379+
cmd = exec.Command("make", "feast-ci-dev-docker-img")
380+
_, err = Run(cmd, testDir)
381+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
382+
383+
By("Tag the local feast image for the integration tests")
384+
cmd = exec.Command("docker", "image", "tag", feastImage, feastLocalImage)
385+
_, err = Run(cmd, testDir)
386+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
387+
388+
By("loading the the feast image on Kind cluster")
389+
err = LoadImageToKindClusterWithName(feastLocalImage, testDir)
390+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
391+
}
390392

391393
By("installing CRDs")
392394
cmd = exec.Command("make", "install")

‎sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ USER 0
44
RUN npm install -g yarn yalc && rm -rf .npm
55
USER default
66

7-
COPY --chown=default . ${APP_ROOT}/src
7+
COPY --chown=default .git ${APP_ROOT}/src/.git
8+
COPY --chown=default setup.py pyproject.toml README.md Makefile ${APP_ROOT}/src/
9+
COPY --chown=default protos ${APP_ROOT}/src/protos
10+
COPY --chown=default ui ${APP_ROOT}/src/ui
11+
COPY --chown=default sdk/python ${APP_ROOT}/src/sdk/python
812

913
WORKDIR ${APP_ROOT}/src/ui
1014
RUN npm install && \

0 commit comments

Comments
 (0)