From ea746142a84b436fb347b704fbd2abe61cf5198b Mon Sep 17 00:00:00 2001 From: Tommy Hughes IV Date: Thu, 30 Jan 2025 09:16:50 -0600 Subject: [PATCH 1/3] chore: Switch base builder images to ubi8 (#4987) switch base images to ubi8 Signed-off-by: Tommy Hughes --- infra/feast-operator/Dockerfile | 4 ++-- sdk/python/feast/infra/feature_servers/multicloud/Dockerfile | 2 +- .../feast/infra/feature_servers/multicloud/Dockerfile.dev | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/feast-operator/Dockerfile b/infra/feast-operator/Dockerfile index 9fd79d7285..c7d4f6b696 100644 --- a/infra/feast-operator/Dockerfile +++ b/infra/feast-operator/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM registry.access.redhat.com/ubi9/go-toolset:1.22.9 AS builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.22.9 AS builder ARG TARGETOS ARG TARGETARCH @@ -22,7 +22,7 @@ COPY internal/controller/ internal/controller/ # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform. RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/main.go -FROM registry.access.redhat.com/ubi9/ubi-micro:9.5 +FROM registry.access.redhat.com/ubi8/ubi-micro:8.10 WORKDIR / COPY --from=builder /opt/app-root/src/manager . USER 65532:65532 diff --git a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile index fd3c258d89..6e1c81b654 100644 --- a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile +++ b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:9.5 +FROM registry.access.redhat.com/ubi8/python-311:1 ARG VERSION RUN pip install "feast[aws,gcp,snowflake,redis,go,mysql,postgres,opentelemetry,grpcio,k8s,duckdb,milvus]"==${VERSION} diff --git a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev index add170fb1d..75b9766cf9 100644 --- a/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev +++ b/sdk/python/feast/infra/feature_servers/multicloud/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:9.5 +FROM registry.access.redhat.com/ubi8/python-311:1 COPY --chown=default . ${APP_ROOT}/src RUN pip install --no-cache-dir pip-tools && \ From 0579dcb0f5e6357f6f5bd573d0f5b802ce39f136 Mon Sep 17 00:00:00 2001 From: Tommy Hughes Date: Thu, 30 Jan 2025 09:35:54 -0600 Subject: [PATCH 2/3] force feast-ui to be built locally Signed-off-by: Tommy Hughes --- infra/feast-operator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/feast-operator/Makefile b/infra/feast-operator/Makefile index de8164b7f2..20f7dd067c 100644 --- a/infra/feast-operator/Makefile +++ b/infra/feast-operator/Makefile @@ -97,7 +97,7 @@ help: ## Display this help. .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases + $(CONTROLLER_GEN) rbac:roleName=manager-role crd:maxDescLen=0 webhook paths="./..." output:crd:artifacts:config=config/crd/bases .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. From 0d7595507ea49552d4c4636b4723fe48df2c2811 Mon Sep 17 00:00:00 2001 From: Tommy Hughes Date: Thu, 30 Jan 2025 09:36:51 -0600 Subject: [PATCH 3/3] force feast-ui to be built locally Signed-off-by: Tommy Hughes --- infra/feast-operator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/feast-operator/Makefile b/infra/feast-operator/Makefile index 20f7dd067c..de8164b7f2 100644 --- a/infra/feast-operator/Makefile +++ b/infra/feast-operator/Makefile @@ -97,7 +97,7 @@ help: ## Display this help. .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=manager-role crd:maxDescLen=0 webhook paths="./..." output:crd:artifacts:config=config/crd/bases + $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.