From f7d3932a81f17b8bd4452ae96c71f9adc137efc2 Mon Sep 17 00:00:00 2001 From: Revital Sur Date: Wed, 15 Jan 2025 06:08:13 -0600 Subject: [PATCH] Remove KFP_DOCKER_VERSION. Signed-off-by: Revital Sur --- .make.versions | 3 --- kfp/RELEASE.md | 2 -- kfp/kfp_ray_components/Makefile | 6 +++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.make.versions b/.make.versions index e153de375..4cde94aa9 100644 --- a/.make.versions +++ b/.make.versions @@ -36,9 +36,6 @@ DPK_LIB_KFP_VERSION=$(DPK_VERSION) DPK_LIB_KFP_VERSION_v2=$(DPK_VERSION) DPK_LIB_KFP_SHARED=$(DPK_VERSION) -KFP_DOCKER_VERSION=$(DOCKER_IMAGE_VERSION) -KFP_DOCKER_VERSION_v2=$(DOCKER_IMAGE_VERSION) - DPK_CONNECTOR_VERSION=0.2.4.dev0 ################## ################## ################## ################## ################## ################## diff --git a/kfp/RELEASE.md b/kfp/RELEASE.md index eb43cb200..6395c2627 100644 --- a/kfp/RELEASE.md +++ b/kfp/RELEASE.md @@ -17,8 +17,6 @@ The KFP package build uses the following variables from the file: - DPK_LIB_KFP_VERSION - the version of `kfp_v1_workflow_support` - DPK_LIB_KFP_VERSION_v2 - the version of `kfp_v2_workflow_support` - DPK_LIB_KFP_SHARED - the version of `kfp_shared_workflow_support` -- KFP_DOCKER_VERSION - the docker image version of KFP components for KFPv1 -- KFP_DOCKER_VERSION_v2 - the docker image version of KFP components for KFPv2 **Note:** The docker images are dependent on the libraries but use the python source code from the repository, so inorder to build docker images, the python modules (libraries) do not have to be deployed. diff --git a/kfp/kfp_ray_components/Makefile b/kfp/kfp_ray_components/Makefile index cac6047ce..7edf88df9 100644 --- a/kfp/kfp_ray_components/Makefile +++ b/kfp/kfp_ray_components/Makefile @@ -46,7 +46,7 @@ image: Dockerfile requirements.txt .PHONE: set-versions set-versions: - @# Help: Update yaml files to build images tagged as version $(KFP_DOCKER_VERSION). + @# Help: Update yaml files to build images tagged as version $(DOCKER_IMAGE_VERSION). @$(MAKE) .reconcile-requirements FILE=createRayClusterComponent.yaml @$(MAKE) .reconcile-requirements FILE=deleteRayClusterComponent.yaml @$(MAKE) .reconcile-requirements FILE=executeRayJobComponent.yaml @@ -71,9 +71,9 @@ docker-save-image: .PHONY: publish publish: echo "Publishing kfp-data-processing" - $(MAKE) KFPv2=0 DOCKER_IMAGE_NAME="kfp-data-processing" DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION} .defaults.publish-image + $(MAKE) KFPv2=0 DOCKER_IMAGE_NAME="kfp-data-processing" .defaults.publish-image echo "Publishing kfp-data-processing_v2" - $(MAKE) KFPv2=1 DOCKER_IMAGE_NAME="kfp-data-processing_v2" DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION_v2} .defaults.publish-image + $(MAKE) KFPv2=1 DOCKER_IMAGE_NAME="kfp-data-processing_v2" .defaults.publish-image test::