From f9ff3b8bd8509bc47eaa9f521cbd81666f6dc357 Mon Sep 17 00:00:00 2001 From: Yehuda Lebi Date: Tue, 16 Jul 2024 16:59:41 +0300 Subject: [PATCH] Rename k8s-local-volume-provisioner to local-csi-driver --- .github/workflows/releases.yaml | 2 +- Makefile | 4 ++-- README.md | 8 ++++---- .../local-csi-driver-tests.go | 4 ++-- cmd/local-csi-driver/local-csi-driver.go | 4 ++-- .../local-csi-driver/50_daemonset.yaml | 2 +- example/disk-setup/50_daemonset.yaml | 2 +- go.mod | 2 +- hack/ci-deploy.sh | 2 +- .../Dockerfile | 8 ++++---- .../Dockerfile | 4 ++-- pkg/cmd/local-csi-driver/driver.go | 18 +++++++++--------- pkg/cmd/tests/tests.go | 4 ++-- pkg/cmd/tests/tests_run.go | 15 ++++++++------- pkg/driver/controller.go | 6 +++--- pkg/driver/driver.go | 4 ++-- pkg/driver/limit/xfs/limit.go | 12 ++++++------ pkg/driver/node.go | 4 ++-- pkg/driver/volume/volumemanager.go | 4 ++-- pkg/util/slices/slices_test.go | 2 +- test/e2e/include.go | 2 +- test/e2e/set/localdriver/capacity.go | 4 ++-- test/e2e/set/localdriver/upstream.go | 2 +- test/sanity/set/localdriver/sanity_test.go | 6 +++--- 24 files changed, 63 insertions(+), 62 deletions(-) rename images/{k8s-local-volume-provisioner-tests => local-csi-driver-tests}/Dockerfile (65%) rename images/{k8s-local-volume-provisioner => local-csi-driver}/Dockerfile (76%) diff --git a/.github/workflows/releases.yaml b/.github/workflows/releases.yaml index f8a3b2b2..a7d3a51b 100644 --- a/.github/workflows/releases.yaml +++ b/.github/workflows/releases.yaml @@ -50,4 +50,4 @@ jobs: githubToken: ${{ secrets.GITHUB_TOKEN }} goVersion: ${{ env.go_version }} genReleaseNotesVersionRef: v1.9.0-alpha.4 - containerImageName: docker.io/scylladb/k8s-local-volume-provisioner + containerImageName: docker.io/scylladb/local-csi-driver diff --git a/Makefile b/Makefile index c8794640..01fdf99e 100644 --- a/Makefile +++ b/Makefile @@ -186,6 +186,6 @@ help: .PHONY: help images: - podman build --squash --format=docker -f=./images/k8s-local-volume-provisioner/Dockerfile -t=docker.io/scylladb/docker.io/scylladb/k8s-local-volume-provisioner . - podman build --squash --format=docker -f=./images/k8s-local-volume-provisioner-tests/Dockerfile -t=docker.io/scylladb/docker.io/scylladb/k8s-local-volume-provisioner-tests . + podman build --squash --format=docker -f=./images/local-csi-driver/Dockerfile -t=docker.io/scylladb/docker.io/scylladb/local-csi-driver . + podman build --squash --format=docker -f=./images/local-csi-driver-tests/Dockerfile -t=docker.io/scylladb/docker.io/scylladb/local-csi-driver-tests . .PHONY: images diff --git a/README.md b/README.md index afa62206..8fba5902 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![GitHub release](https://img.shields.io/github/tag/scylladb/k8s-local-volume-provisioner.svg?label=release)](https://github.com/scylladb/k8s-local-volume-provisioner/releases) -[![Go](https://github.com/scylladb/k8s-local-volume-provisioner/actions/workflows/build-test.yaml/badge.svg?branch=master)](https://github.com/scylladb/k8s-local-volume-provisioner/actions/workflows/build-test.yaml?query=branch%3Amaster) -[![Go Report Card](https://goreportcard.com/badge/github.com/scylladb/k8s-local-volume-provisioner)](https://goreportcard.com/report/github.com/scylladb/k8s-local-volume-provisioner) +[![GitHub release](https://img.shields.io/github/tag/scylladb/local-csi-driver.svg?label=release)](https://github.com/scylladb/local-csi-driver +[![Go](https://github.com/scylladb/local-csi-driver/actions/workflows/build-test.yaml/badge.svg?branch=master)](https://github.com/scylladb/local-csi-driver/actions/workflows/build-test.yaml?query=branch%3Amaster) +[![Go Report Card](https://goreportcard.com/badge/github.com/scylladb/local-csi-driver)](https://goreportcard.com/report/github.com/scylladb/local-csi-driver [![Language](https://img.shields.io/badge/Language-Go-blue.svg)](https://golang.org/) -[![LICENSE](https://img.shields.io/github/license/scylladb/k8s-local-volume-provisioner.svg)](https://github.com/scylladb/k8s-local-volume-provisioner/blob/master/LICENSE) +[![LICENSE](https://img.shields.io/github/license/scylladb/local-csi-driver.svg)](https://github.com/scylladb/local-csi-driver/LICENSE) ## Local Volume Provisioner diff --git a/cmd/local-csi-driver-tests/local-csi-driver-tests.go b/cmd/local-csi-driver-tests/local-csi-driver-tests.go index c9667057..66cdb246 100644 --- a/cmd/local-csi-driver-tests/local-csi-driver-tests.go +++ b/cmd/local-csi-driver-tests/local-csi-driver-tests.go @@ -10,8 +10,8 @@ import ( "runtime" "time" - cmd "github.com/scylladb/k8s-local-volume-provisioner/pkg/cmd/tests" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/genericclioptions" + cmd "github.com/scylladb/local-csi-driver/pkg/cmd/tests" + "github.com/scylladb/local-csi-driver/pkg/genericclioptions" "k8s.io/klog/v2" ) diff --git a/cmd/local-csi-driver/local-csi-driver.go b/cmd/local-csi-driver/local-csi-driver.go index 8d378a99..7c2c4e55 100644 --- a/cmd/local-csi-driver/local-csi-driver.go +++ b/cmd/local-csi-driver/local-csi-driver.go @@ -7,8 +7,8 @@ import ( "fmt" "os" - cmd "github.com/scylladb/k8s-local-volume-provisioner/pkg/cmd/local-csi-driver" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/genericclioptions" + cmd "github.com/scylladb/local-csi-driver/pkg/cmd/local-csi-driver" + "github.com/scylladb/local-csi-driver/pkg/genericclioptions" "k8s.io/klog/v2" ) diff --git a/deploy/kubernetes/local-csi-driver/50_daemonset.yaml b/deploy/kubernetes/local-csi-driver/50_daemonset.yaml index 6e66b7e4..93c27d13 100644 --- a/deploy/kubernetes/local-csi-driver/50_daemonset.yaml +++ b/deploy/kubernetes/local-csi-driver/50_daemonset.yaml @@ -23,7 +23,7 @@ spec: - name: local-csi-driver securityContext: privileged: true - image: docker.io/scylladb/k8s-local-volume-provisioner:latest + image: docker.io/scylladb/local-csi-driver:latest imagePullPolicy: IfNotPresent args: - --listen=/csi/csi.sock diff --git a/example/disk-setup/50_daemonset.yaml b/example/disk-setup/50_daemonset.yaml index 27a70532..695e6290 100644 --- a/example/disk-setup/50_daemonset.yaml +++ b/example/disk-setup/50_daemonset.yaml @@ -18,7 +18,7 @@ spec: - operator: Exists containers: - name: xfs-disk-setup - image: docker.io/scylladb/k8s-local-volume-provisioner:latest + image: docker.io/scylladb/local-csi-driver:latest imagePullPolicy: IfNotPresent command: - "/bin/bash" diff --git a/go.mod b/go.mod index acfcea56..7e038122 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/scylladb/k8s-local-volume-provisioner +module github.com/scylladb/local-csi-driver go 1.22.4 diff --git a/hack/ci-deploy.sh b/hack/ci-deploy.sh index 640e2000..88132f0c 100755 --- a/hack/ci-deploy.sh +++ b/hack/ci-deploy.sh @@ -39,7 +39,7 @@ cp ./example/disk-setup/*.yaml "${deploy_dir}/disk-setup" cp ./example/storageclass_xfs.yaml "${deploy_dir}/" for f in $( find "${deploy_dir}"/ -type f -name '*.yaml' ); do - sed -i -E -e "s~docker.io/scylladb/k8s-local-volume-provisioner(:|@sha256:)[^ ]*~${DRIVER_IMAGE_REF}~" "${f}" + sed -i -E -e "s~docker.io/scylladb/local-csi-driver(:|@sha256:)[^ ]*~${DRIVER_IMAGE_REF}~" "${f}" done kubectl_create -f "${deploy_dir}"/storageclass_xfs.yaml diff --git a/images/k8s-local-volume-provisioner-tests/Dockerfile b/images/local-csi-driver-tests/Dockerfile similarity index 65% rename from images/k8s-local-volume-provisioner-tests/Dockerfile rename to images/local-csi-driver-tests/Dockerfile index 6334ba36..ff349f34 100644 --- a/images/k8s-local-volume-provisioner-tests/Dockerfile +++ b/images/local-csi-driver-tests/Dockerfile @@ -1,16 +1,16 @@ FROM quay.io/scylladb/scylla-operator-images:golang-1.22 AS builder SHELL ["/bin/bash", "-euEo", "pipefail", "-O", "inherit_errexit", "-c"] -WORKDIR /go/src/github.com/scylladb/k8s-local-volume-provisioner +WORKDIR /go/src/github.com/scylladb/local-csi-driver COPY . . RUN make build --warn-undefined-variables GO_BUILD_PACKAGES="./cmd/local-csi-driver-tests ./vendor/k8s.io/kubernetes/cmd/kubectl" FROM quay.io/scylladb/scylla-operator-images:base-ubuntu-22.04 SHELL ["/bin/bash", "-euEo", "pipefail", "-O", "inherit_errexit", "-c"] -WORKDIR /go/src/github.com/scylladb/k8s-local-volume-provisioner +WORKDIR /go/src/github.com/scylladb/local-csi-driver # This sucks but upstream csi tests need this. COPY vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/. vendor/k8s.io/kubernetes/test/e2e/testing-manifests/storage-csi/ -COPY --from=builder /go/src/github.com/scylladb/k8s-local-volume-provisioner/local-csi-driver-tests /usr/bin/ -COPY --from=builder /go/src/github.com/scylladb/k8s-local-volume-provisioner/kubectl /usr/bin/ +COPY --from=builder /go/src/github.com/scylladb/local-csi-driver/local-csi-driver-tests /usr/bin/ +COPY --from=builder /go/src/github.com/scylladb/local-csi-driver/kubectl /usr/bin/ ENTRYPOINT ["/usr/bin/local-csi-driver-tests"] diff --git a/images/k8s-local-volume-provisioner/Dockerfile b/images/local-csi-driver/Dockerfile similarity index 76% rename from images/k8s-local-volume-provisioner/Dockerfile rename to images/local-csi-driver/Dockerfile index ce30ef83..ff188bed 100644 --- a/images/k8s-local-volume-provisioner/Dockerfile +++ b/images/local-csi-driver/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/scylladb/scylla-operator-images:golang-1.22 AS builder SHELL ["/bin/bash", "-euEo", "pipefail", "-O", "inherit_errexit", "-c"] -WORKDIR /go/src/github.com/scylladb/k8s-local-volume-provisioner +WORKDIR /go/src/github.com/scylladb/local-csi-driver COPY . . RUN make build --warn-undefined-variables GO_BUILD_PACKAGES=./cmd/local-csi-driver @@ -12,5 +12,5 @@ RUN apt-get update && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -COPY --from=builder /go/src/github.com/scylladb/k8s-local-volume-provisioner/local-csi-driver /usr/bin/ +COPY --from=builder /go/src/github.com/scylladb/local-csi-driver/local-csi-driver /usr/bin/ ENTRYPOINT ["/usr/bin/local-csi-driver"] diff --git a/pkg/cmd/local-csi-driver/driver.go b/pkg/cmd/local-csi-driver/driver.go index e740d563..0ff1121d 100644 --- a/pkg/cmd/local-csi-driver/driver.go +++ b/pkg/cmd/local-csi-driver/driver.go @@ -9,15 +9,15 @@ import ( "os" "github.com/container-storage-interface/spec/lib/go/csi" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/cmdutil" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit/xfs" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/volume" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/genericclioptions" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/signals" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/fs" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/version" + "github.com/scylladb/local-csi-driver/pkg/cmdutil" + "github.com/scylladb/local-csi-driver/pkg/driver" + "github.com/scylladb/local-csi-driver/pkg/driver/limit" + "github.com/scylladb/local-csi-driver/pkg/driver/limit/xfs" + "github.com/scylladb/local-csi-driver/pkg/driver/volume" + "github.com/scylladb/local-csi-driver/pkg/genericclioptions" + "github.com/scylladb/local-csi-driver/pkg/signals" + "github.com/scylladb/local-csi-driver/pkg/util/fs" + "github.com/scylladb/local-csi-driver/pkg/version" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/pkg/cmd/tests/tests.go b/pkg/cmd/tests/tests.go index 4376b9e7..9667c508 100644 --- a/pkg/cmd/tests/tests.go +++ b/pkg/cmd/tests/tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/scylladb/k8s-local-volume-provisioner/pkg/cmdutil" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/genericclioptions" + "github.com/scylladb/local-csi-driver/pkg/cmdutil" + "github.com/scylladb/local-csi-driver/pkg/genericclioptions" "github.com/spf13/cobra" "k8s.io/kubectl/pkg/util/templates" ) diff --git a/pkg/cmd/tests/tests_run.go b/pkg/cmd/tests/tests_run.go index 1f4e86df..33104cd7 100644 --- a/pkg/cmd/tests/tests_run.go +++ b/pkg/cmd/tests/tests_run.go @@ -20,19 +20,20 @@ import ( "github.com/onsi/gomega" gomegaformat "github.com/onsi/gomega/format" "github.com/pkg/errors" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/cmdutil" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/genericclioptions" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/signals" - ginkgotest "github.com/scylladb/k8s-local-volume-provisioner/pkg/test/ginkgo" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/thirdparty/github.com/onsi/ginkgo/v2/exposedinternal/parallel_support" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/version" + "github.com/scylladb/local-csi-driver/pkg/cmdutil" + "github.com/scylladb/local-csi-driver/pkg/genericclioptions" + "github.com/scylladb/local-csi-driver/pkg/signals" + ginkgotest "github.com/scylladb/local-csi-driver/pkg/test/ginkgo" + "github.com/scylladb/local-csi-driver/pkg/thirdparty/github.com/onsi/ginkgo/v2/exposedinternal/parallel_support" + "github.com/scylladb/local-csi-driver/pkg/version" "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/util/errors" cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog/v2" "k8s.io/kubectl/pkg/util/templates" + // Include suites - _ "github.com/scylladb/k8s-local-volume-provisioner/test/e2e" + _ "github.com/scylladb/local-csi-driver/test/e2e" ) const ( diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go index d2a2251c..09fa53c4 100644 --- a/pkg/driver/controller.go +++ b/pkg/driver/controller.go @@ -8,9 +8,9 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/volume" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/slices" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/uuid" + "github.com/scylladb/local-csi-driver/pkg/driver/volume" + "github.com/scylladb/local-csi-driver/pkg/util/slices" + "github.com/scylladb/local-csi-driver/pkg/util/uuid" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go index e7c34747..c6f0e83d 100644 --- a/pkg/driver/driver.go +++ b/pkg/driver/driver.go @@ -7,8 +7,8 @@ import ( "sync" "github.com/container-storage-interface/spec/lib/go/csi" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/volume" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/slices" + "github.com/scylladb/local-csi-driver/pkg/driver/volume" + "github.com/scylladb/local-csi-driver/pkg/util/slices" "k8s.io/apimachinery/pkg/util/errors" ) diff --git a/pkg/driver/limit/xfs/limit.go b/pkg/driver/limit/xfs/limit.go index 85bfc1fd..43e3de9b 100644 --- a/pkg/driver/limit/xfs/limit.go +++ b/pkg/driver/limit/xfs/limit.go @@ -10,12 +10,12 @@ import ( "sync" "github.com/pkg/errors" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit/xfs/fxattrs" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit/xfs/quotactl" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/volume" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/fs" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/slices" + "github.com/scylladb/local-csi-driver/pkg/driver/limit" + "github.com/scylladb/local-csi-driver/pkg/driver/limit/xfs/fxattrs" + "github.com/scylladb/local-csi-driver/pkg/driver/limit/xfs/quotactl" + "github.com/scylladb/local-csi-driver/pkg/driver/volume" + "github.com/scylladb/local-csi-driver/pkg/util/fs" + "github.com/scylladb/local-csi-driver/pkg/util/slices" "k8s.io/klog/v2" "k8s.io/mount-utils" ) diff --git a/pkg/driver/node.go b/pkg/driver/node.go index 19ada185..fa18f192 100644 --- a/pkg/driver/node.go +++ b/pkg/driver/node.go @@ -9,8 +9,8 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/slices" + "github.com/scylladb/local-csi-driver/pkg/driver/limit" + "github.com/scylladb/local-csi-driver/pkg/util/slices" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/klog/v2" diff --git a/pkg/driver/volume/volumemanager.go b/pkg/driver/volume/volumemanager.go index 0103b63e..c5084988 100644 --- a/pkg/driver/volume/volumemanager.go +++ b/pkg/driver/volume/volumemanager.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/slices" + "github.com/scylladb/local-csi-driver/pkg/driver/limit" + "github.com/scylladb/local-csi-driver/pkg/util/slices" "golang.org/x/sys/unix" "k8s.io/apimachinery/pkg/util/errors" "k8s.io/klog/v2" diff --git a/pkg/util/slices/slices_test.go b/pkg/util/slices/slices_test.go index 1800e1fb..59c348bf 100644 --- a/pkg/util/slices/slices_test.go +++ b/pkg/util/slices/slices_test.go @@ -5,7 +5,7 @@ package slices_test import ( "testing" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/util/slices" + "github.com/scylladb/local-csi-driver/pkg/util/slices" ) func TestContains(t *testing.T) { diff --git a/test/e2e/include.go b/test/e2e/include.go index 092bc557..42df5cd8 100644 --- a/test/e2e/include.go +++ b/test/e2e/include.go @@ -3,5 +3,5 @@ package e2e import ( - _ "github.com/scylladb/k8s-local-volume-provisioner/test/e2e/set/localdriver" + _ "github.com/scylladb/local-csi-driver/test/e2e/set/localdriver" ) diff --git a/test/e2e/set/localdriver/capacity.go b/test/e2e/set/localdriver/capacity.go index b4a93d75..9634b9f9 100644 --- a/test/e2e/set/localdriver/capacity.go +++ b/test/e2e/set/localdriver/capacity.go @@ -9,8 +9,8 @@ import ( g "github.com/onsi/ginkgo/v2" o "github.com/onsi/gomega" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/volume" + "github.com/scylladb/local-csi-driver/pkg/driver" + "github.com/scylladb/local-csi-driver/pkg/driver/volume" corev1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/test/e2e/set/localdriver/upstream.go b/test/e2e/set/localdriver/upstream.go index 37655955..d34e022a 100644 --- a/test/e2e/set/localdriver/upstream.go +++ b/test/e2e/set/localdriver/upstream.go @@ -6,7 +6,7 @@ import ( "context" g "github.com/onsi/ginkgo/v2" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver" + "github.com/scylladb/local-csi-driver/pkg/driver" corev1 "k8s.io/api/core/v1" "k8s.io/api/storage/v1" storagev1 "k8s.io/api/storage/v1" diff --git a/test/sanity/set/localdriver/sanity_test.go b/test/sanity/set/localdriver/sanity_test.go index 50b7ced1..6a9bd049 100644 --- a/test/sanity/set/localdriver/sanity_test.go +++ b/test/sanity/set/localdriver/sanity_test.go @@ -14,9 +14,9 @@ import ( "github.com/kubernetes-csi/csi-test/v5/pkg/sanity" g "github.com/onsi/ginkgo/v2" o "github.com/onsi/gomega" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/limit" - "github.com/scylladb/k8s-local-volume-provisioner/pkg/driver/volume" + "github.com/scylladb/local-csi-driver/pkg/driver" + "github.com/scylladb/local-csi-driver/pkg/driver/limit" + "github.com/scylladb/local-csi-driver/pkg/driver/volume" "google.golang.org/grpc" "k8s.io/mount-utils" )