Skip to content

Commit

Permalink
Merge pull request #58 from tnozicka/rename-0.4
Browse files Browse the repository at this point in the history
[v0.4] Rename k8s-local-volume-provisioner to local-csi-driver
  • Loading branch information
scylla-operator-bot[bot] authored Jul 18, 2024
2 parents 587547c + f9ff3b8 commit 8678ce1
Show file tree
Hide file tree
Showing 24 changed files with 63 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions cmd/local-csi-driver-tests/local-csi-driver-tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/local-csi-driver/local-csi-driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/local-csi-driver/50_daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/disk-setup/50_daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/scylladb/k8s-local-volume-provisioner
module github.com/scylladb/local-csi-driver

go 1.22.4

Expand Down
2 changes: 1 addition & 1 deletion hack/ci-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"]
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
18 changes: 9 additions & 9 deletions pkg/cmd/local-csi-driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/tests/tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
15 changes: 8 additions & 7 deletions pkg/cmd/tests/tests_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions pkg/driver/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
12 changes: 6 additions & 6 deletions pkg/driver/limit/xfs/limit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/driver/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/driver/volume/volumemanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/slices/slices_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/include.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
4 changes: 2 additions & 2 deletions test/e2e/set/localdriver/capacity.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/set/localdriver/upstream.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions test/sanity/set/localdriver/sanity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down

0 comments on commit 8678ce1

Please sign in to comment.