From 9fc8ab38f16f5766e68ebf42d9ca35f79cd6a781 Mon Sep 17 00:00:00 2001
From: votti <mcvotti@gmail.com>
Date: Wed, 21 Jun 2023 14:40:47 +0200
Subject: [PATCH] Move KFP V1 metrics collector docker files to v1 subfolder

As per suggestion
---
 .github/workflows/publish-core-images.yaml                      | 2 +-
 .../v1}/Dockerfile                                              | 0
 .../{kfpv1-metricscollector => kfp-metricscollector/v1}/main.py | 0
 .../v1}/requirements.txt                                        | 0
 scripts/v1beta1/build.sh                                        | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename cmd/metricscollector/v1beta1/{kfpv1-metricscollector => kfp-metricscollector/v1}/Dockerfile (100%)
 rename cmd/metricscollector/v1beta1/{kfpv1-metricscollector => kfp-metricscollector/v1}/main.py (100%)
 rename cmd/metricscollector/v1beta1/{kfpv1-metricscollector => kfp-metricscollector/v1}/requirements.txt (100%)

diff --git a/.github/workflows/publish-core-images.yaml b/.github/workflows/publish-core-images.yaml
index 7b5bea240f1..5708e9ce9ac 100644
--- a/.github/workflows/publish-core-images.yaml
+++ b/.github/workflows/publish-core-images.yaml
@@ -33,4 +33,4 @@ jobs:
           - component-name: tfevent-metrics-collector
             dockerfile: cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile
           - component-name: kfpv1-metrics-collector
-            dockerfile: cmd/metricscollector/v1beta1/kfpv1-metricscollector/Dockerfile
+            dockerfile: cmd/metricscollector/v1beta1/kfp-metricscollector/v1/Dockerfile
diff --git a/cmd/metricscollector/v1beta1/kfpv1-metricscollector/Dockerfile b/cmd/metricscollector/v1beta1/kfp-metricscollector/v1/Dockerfile
similarity index 100%
rename from cmd/metricscollector/v1beta1/kfpv1-metricscollector/Dockerfile
rename to cmd/metricscollector/v1beta1/kfp-metricscollector/v1/Dockerfile
diff --git a/cmd/metricscollector/v1beta1/kfpv1-metricscollector/main.py b/cmd/metricscollector/v1beta1/kfp-metricscollector/v1/main.py
similarity index 100%
rename from cmd/metricscollector/v1beta1/kfpv1-metricscollector/main.py
rename to cmd/metricscollector/v1beta1/kfp-metricscollector/v1/main.py
diff --git a/cmd/metricscollector/v1beta1/kfpv1-metricscollector/requirements.txt b/cmd/metricscollector/v1beta1/kfp-metricscollector/v1/requirements.txt
similarity index 100%
rename from cmd/metricscollector/v1beta1/kfpv1-metricscollector/requirements.txt
rename to cmd/metricscollector/v1beta1/kfp-metricscollector/v1/requirements.txt
diff --git a/scripts/v1beta1/build.sh b/scripts/v1beta1/build.sh
index 43952074ae6..0fc1dd167d4 100755
--- a/scripts/v1beta1/build.sh
+++ b/scripts/v1beta1/build.sh
@@ -72,7 +72,7 @@ echo -e "\nBuilding file metrics collector image...\n"
 docker buildx build --platform "linux/${ARCH}" -t "${REGISTRY}/file-metrics-collector:${TAG}" -f ${CMD_PREFIX}/metricscollector/${VERSION}/file-metricscollector/Dockerfile .
 
 echo -e "\nBuilding kfpv1 metrics collector image...\n"
-docker buildx build --platform "linux/${ARCH}" -t "${REGISTRY}/kfpv1-metrics-collector:${TAG}" -f ${CMD_PREFIX}/metricscollector/${VERSION}/kfpv1-metricscollector/Dockerfile .
+docker buildx build --platform "linux/${ARCH}" self, -t "${REGISTRY}/kfpv1-metrics-collector:${TAG}" -f ${CMD_PREFIX}/metricscollector/${VERSION}/kfp-metricscollector/v1/Dockerfile .
 
 echo -e "\nBuilding TF Event metrics collector image...\n"
 if [ "${ARCH}" == "ppc64le" ]; then