Move csi under /cmd

Signed-off-by: Andrea Lamparelli <a.lamparelli95@gmail.com>
kubeflow · Dec 4, 2024 · 694053a · 694053a
1 parent b914614
commit 694053a
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ PROJECT_BIN := $(PROJECT_PATH)/bin
 GO ?= "$(shell which go)"
 BFF_PATH := $(PROJECT_PATH)/clients/ui/bff
 UI_PATH := $(PROJECT_PATH)/clients/ui/frontend
-CSI_PATH := $(PROJECT_PATH)/clients/csi
+CSI_PATH := $(PROJECT_PATH)/cmd/csi
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.29
@@ -50,7 +50,7 @@ endif
 
 # The BUILD_PATH is still the root
 ifeq ($(IMG_REPO),model-registry-storage-initializer)
-    DOCKERFILE := Dockerfile.csi
+    DOCKERFILE := $(CSI_PATH)/Dockerfile.csi
 endif
 
 model-registry: build
@@ -229,7 +229,7 @@ lint:
 .PHONY: lint/csi
 lint/csi:
 	${GOLANGCI_LINT} run ${CSI_PATH}/main.go
-	${GOLANGCI_LINT} run ${CSI_PATH}/pkg/...
+	${GOLANGCI_LINT} run internal/csi/...
 
 .PHONY: test
 test: gen bin/envtest

diff --git a/Dockerfile.csi → cmd/csi/Dockerfile.csi b/Dockerfile.csi → cmd/csi/Dockerfile.csi
@@ -29,9 +29,6 @@ COPY scripts/ scripts/
 COPY pkg/ pkg/
 COPY patches/ patches/
 COPY templates/ templates/
-# csi specific source code
-COPY clients/csi/main.go clients/csi/
-COPY clients/csi/pkg/ clients/csi/pkg/
 
 # Download tools
 RUN make deps

diff --git a/clients/csi/GET_STARTED.md → cmd/csi/GET_STARTED.md b/clients/csi/GET_STARTED.md → cmd/csi/GET_STARTED.md
diff --git a/clients/csi/README.md → cmd/csi/README.md b/clients/csi/README.md → cmd/csi/README.md
diff --git a/clients/csi/main.go → cmd/csi/main.go b/clients/csi/main.go → cmd/csi/main.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/kubeflow/model-registry/clients/csi/pkg/modelregistry"
-	"github.com/kubeflow/model-registry/clients/csi/pkg/storage"
+	"github.com/kubeflow/model-registry/internal/csi/modelregistry"
+	"github.com/kubeflow/model-registry/internal/csi/storage"
 	"github.com/kubeflow/model-registry/pkg/openapi"
 )
 

diff --git a/...odelregistry.clusterstoragecontainer.yaml → ...odelregistry.clusterstoragecontainer.yaml b/...odelregistry.clusterstoragecontainer.yaml → ...odelregistry.clusterstoragecontainer.yaml
diff --git a/clients/csi/pkg/constants/constants.go → internal/csi/constants/constants.go b/clients/csi/pkg/constants/constants.go → internal/csi/constants/constants.go
diff --git a/clients/csi/pkg/modelregistry/api_client.go → internal/csi/modelregistry/api_client.go b/clients/csi/pkg/modelregistry/api_client.go → internal/csi/modelregistry/api_client.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/kubeflow/model-registry/clients/csi/pkg/constants"
+	"github.com/kubeflow/model-registry/internal/csi/constants"
 	"github.com/kubeflow/model-registry/pkg/openapi"
 )
 

diff --git a/...csi/pkg/storage/modelregistry_provider.go → ...nal/csi/storage/modelregistry_provider.go b/...csi/pkg/storage/modelregistry_provider.go → ...nal/csi/storage/modelregistry_provider.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	kserve "github.com/kserve/kserve/pkg/agent/storage"
-	"github.com/kubeflow/model-registry/clients/csi/pkg/constants"
+	"github.com/kubeflow/model-registry/internal/csi/constants"
 	"github.com/kubeflow/model-registry/pkg/openapi"
 )