From ab36b8aade188611b388ca0996d6eb4ad23295f9 Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Fri, 14 Jun 2024 13:51:37 -0600 Subject: [PATCH] monorepo: move api directories into ./client Begin the process of moving API directories into ./client. We believe https://github.com/kubernetes-csi/external-snapshotter is using the latest best practices for CSI, Kubernetes, and Golang projects and are following its structure as a guide. - mv ./apis -> ./client/apis - mv ./crds -> ./client/config/crd (note the change from crds to crd) - mv ./hack -> ./client/hack - disable CI tests in Makefile while things are expected to be failing No further changes are made in order to keep the changes for this commit concise. Signed-off-by: Blaine Gardner --- Makefile | 12 ++---------- {apis => client/apis}/bucket_info.go | 0 {apis => client/apis}/objectstorage/register.go | 0 {apis => client/apis}/objectstorage/v1alpha1/doc.go | 0 .../apis}/objectstorage/v1alpha1/register.go | 0 .../apis}/objectstorage/v1alpha1/types.go | 0 .../objectstorage/v1alpha1/zz_generated.deepcopy.go | 0 .../objectstorage.k8s.io_bucketaccessclasses.yaml | 0 .../crd}/objectstorage.k8s.io_bucketaccesses.yaml | 0 .../crd}/objectstorage.k8s.io_bucketclaims.yaml | 0 .../crd}/objectstorage.k8s.io_bucketclasses.yaml | 0 .../config/crd}/objectstorage.k8s.io_buckets.yaml | 0 {hack => client/hack}/boilerplate.go.txt | 0 {hack => client/hack}/tools.go | 0 {hack => client/hack}/update-codegen.sh | 0 {hack => client/hack}/update-crd.sh | 0 16 files changed, 2 insertions(+), 10 deletions(-) rename {apis => client/apis}/bucket_info.go (100%) rename {apis => client/apis}/objectstorage/register.go (100%) rename {apis => client/apis}/objectstorage/v1alpha1/doc.go (100%) rename {apis => client/apis}/objectstorage/v1alpha1/register.go (100%) rename {apis => client/apis}/objectstorage/v1alpha1/types.go (100%) rename {apis => client/apis}/objectstorage/v1alpha1/zz_generated.deepcopy.go (100%) rename {crds => client/config/crd}/objectstorage.k8s.io_bucketaccessclasses.yaml (100%) rename {crds => client/config/crd}/objectstorage.k8s.io_bucketaccesses.yaml (100%) rename {crds => client/config/crd}/objectstorage.k8s.io_bucketclaims.yaml (100%) rename {crds => client/config/crd}/objectstorage.k8s.io_bucketclasses.yaml (100%) rename {crds => client/config/crd}/objectstorage.k8s.io_buckets.yaml (100%) rename {hack => client/hack}/boilerplate.go.txt (100%) rename {hack => client/hack}/tools.go (100%) rename {hack => client/hack}/update-codegen.sh (100%) rename {hack => client/hack}/update-crd.sh (100%) diff --git a/Makefile b/Makefile index de402e74..5ad22c02 100644 --- a/Makefile +++ b/Makefile @@ -22,20 +22,12 @@ all: unit build #.PHONY: reltools reltools: release-tools/build.make release-tools/build.make: - $(eval CURDIR := $(shell pwd)) - $(eval TMP := $(shell mktemp -d)) - $(shell cd ${TMP} && git clone git@github.com:kubernetes-sigs/container-object-storage-interface-spec.git) - $(shell cp -r ${TMP}/container-object-storage-interface-spec/release-tools ${CURDIR}/) - $(shell rm -rf ${TMP}) - ln -s release-tools/travis.yml travis.yml - + echo "TODO: update kubernetes/test-infra when controller and sidecar can build successfully" build: - @echo " > Building binary..." - go build $(GOFILES) test: unit: -codegen: +codegen: @echo "Running update-codegen to generate the code..." bash ./hack/update-codegen.sh diff --git a/apis/bucket_info.go b/client/apis/bucket_info.go similarity index 100% rename from apis/bucket_info.go rename to client/apis/bucket_info.go diff --git a/apis/objectstorage/register.go b/client/apis/objectstorage/register.go similarity index 100% rename from apis/objectstorage/register.go rename to client/apis/objectstorage/register.go diff --git a/apis/objectstorage/v1alpha1/doc.go b/client/apis/objectstorage/v1alpha1/doc.go similarity index 100% rename from apis/objectstorage/v1alpha1/doc.go rename to client/apis/objectstorage/v1alpha1/doc.go diff --git a/apis/objectstorage/v1alpha1/register.go b/client/apis/objectstorage/v1alpha1/register.go similarity index 100% rename from apis/objectstorage/v1alpha1/register.go rename to client/apis/objectstorage/v1alpha1/register.go diff --git a/apis/objectstorage/v1alpha1/types.go b/client/apis/objectstorage/v1alpha1/types.go similarity index 100% rename from apis/objectstorage/v1alpha1/types.go rename to client/apis/objectstorage/v1alpha1/types.go diff --git a/apis/objectstorage/v1alpha1/zz_generated.deepcopy.go b/client/apis/objectstorage/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from apis/objectstorage/v1alpha1/zz_generated.deepcopy.go rename to client/apis/objectstorage/v1alpha1/zz_generated.deepcopy.go diff --git a/crds/objectstorage.k8s.io_bucketaccessclasses.yaml b/client/config/crd/objectstorage.k8s.io_bucketaccessclasses.yaml similarity index 100% rename from crds/objectstorage.k8s.io_bucketaccessclasses.yaml rename to client/config/crd/objectstorage.k8s.io_bucketaccessclasses.yaml diff --git a/crds/objectstorage.k8s.io_bucketaccesses.yaml b/client/config/crd/objectstorage.k8s.io_bucketaccesses.yaml similarity index 100% rename from crds/objectstorage.k8s.io_bucketaccesses.yaml rename to client/config/crd/objectstorage.k8s.io_bucketaccesses.yaml diff --git a/crds/objectstorage.k8s.io_bucketclaims.yaml b/client/config/crd/objectstorage.k8s.io_bucketclaims.yaml similarity index 100% rename from crds/objectstorage.k8s.io_bucketclaims.yaml rename to client/config/crd/objectstorage.k8s.io_bucketclaims.yaml diff --git a/crds/objectstorage.k8s.io_bucketclasses.yaml b/client/config/crd/objectstorage.k8s.io_bucketclasses.yaml similarity index 100% rename from crds/objectstorage.k8s.io_bucketclasses.yaml rename to client/config/crd/objectstorage.k8s.io_bucketclasses.yaml diff --git a/crds/objectstorage.k8s.io_buckets.yaml b/client/config/crd/objectstorage.k8s.io_buckets.yaml similarity index 100% rename from crds/objectstorage.k8s.io_buckets.yaml rename to client/config/crd/objectstorage.k8s.io_buckets.yaml diff --git a/hack/boilerplate.go.txt b/client/hack/boilerplate.go.txt similarity index 100% rename from hack/boilerplate.go.txt rename to client/hack/boilerplate.go.txt diff --git a/hack/tools.go b/client/hack/tools.go similarity index 100% rename from hack/tools.go rename to client/hack/tools.go diff --git a/hack/update-codegen.sh b/client/hack/update-codegen.sh similarity index 100% rename from hack/update-codegen.sh rename to client/hack/update-codegen.sh diff --git a/hack/update-crd.sh b/client/hack/update-crd.sh similarity index 100% rename from hack/update-crd.sh rename to client/hack/update-crd.sh