Skip to content

Cleanup of cernops string #71 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2023
Merged

Cleanup of cernops string #71 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ifdef VERSION
endif
BINARY_VERSION ?= ${GIT_TAG}

BASE_PKG = github.com/cernops/cvmfs-csi
BASE_PKG = github.com/cvmfs-contrib/cvmfs-csi
# Only set Version if building a tag or VERSION is set
ifneq ($(BINARY_VERSION),)
LDFLAGS += -X ${BASE_PKG}/internal/version.version=${BINARY_VERSION}
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# CVMFS CSI plugin

[![Build Status](https://github.com/cernops/cvmfs-csi/workflows/csi-cvmfsplugin/badge.svg?event=push&branch=master)](https://github.com/cernops/cvmfs-csi/actions?workflow=csi-cvmfsplugin)
[![Go Report Card](https://goreportcard.com/badge/github.com/cernops/cvmfs-csi)](https://goreportcard.com/report/github.com/cernops/cvmfs-csi)
[![GoDoc](https://godoc.org/github.com/cernops/cvmfs-csi?status.svg)](https://godoc.org/github.com/cernops/cvmfs-csi)
[![Build Status](https://github.com/cvmfs-contrib/cvmfs-csi/workflows/csi-cvmfsplugin/badge.svg?event=push&branch=master)](https://github.com/cvmfs-contrib/cvmfs-csi/actions?workflow=csi-cvmfsplugin)
[![Go Report Card](https://goreportcard.com/badge/github.com/cvmfs-contrib/cvmfs-csi)](https://goreportcard.com/report/github.com/cvmfs-contrib/cvmfs-csi)
[![GoDoc](https://godoc.org/github.com/cvmfs-contrib/cvmfs-csi?status.svg)](https://godoc.org/github.com/cvmfs-contrib/cvmfs-csi)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

CVMFS [Container Storage Interface](https://github.com/container-storage-interface/spec) (CSI) plugin provides read-only mounting of [CernVM-FS](https://cernvm.cern.ch/fs/) (CVMFS) repositories in CSI-enabled container orchestrators.
Expand Down
6 changes: 3 additions & 3 deletions cmd/automount-runner/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"fmt"
"os"

"github.com/cernops/cvmfs-csi/internal/cvmfs/automount"
"github.com/cernops/cvmfs-csi/internal/log"
cvmfsversion "github.com/cernops/cvmfs-csi/internal/version"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/automount"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"
cvmfsversion "github.com/cvmfs-contrib/cvmfs-csi/internal/version"

"k8s.io/klog/v2"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/csi-cvmfsplugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"os"
"strings"

"github.com/cernops/cvmfs-csi/internal/cvmfs/driver"
"github.com/cernops/cvmfs-csi/internal/log"
cvmfsversion "github.com/cernops/cvmfs-csi/internal/version"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/driver"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"
cvmfsversion "github.com/cvmfs-contrib/cvmfs-csi/internal/version"

"k8s.io/klog/v2"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/singlemount-runner/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"fmt"
"os"

"github.com/cernops/cvmfs-csi/internal/cvmfs/singlemount"
"github.com/cernops/cvmfs-csi/internal/log"
cvmfsversion "github.com/cernops/cvmfs-csi/internal/version"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/singlemount"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"
cvmfsversion "github.com/cvmfs-contrib/cvmfs-csi/internal/version"

"k8s.io/klog/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion deployments/helm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ helm install cvmfs cern/cvmfs-csi

To use this Helm chart, clone this repository and install the chart:
```
git clone https://github.com/cernops/cvmfs-csi
git clone https://github.com/cvmfs-contrib/cvmfs-csi
```

Helm v2 installation:
Expand Down
4 changes: 2 additions & 2 deletions docs/building-from-source.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ There are pre-built container images available from [cvmfsplugin repo at CERN re

CVMFS CSI is written in Go. Make sure you have Go compiler and other related build tools installed before continuing.

Clone [github.com/cernops/cvmfs-csi](https://github.com/cernops/cvmfs-csi) repository:
Clone [github.com/cvmfs-contrib/cvmfs-csi](https://github.com/cvmfs-contrib/cvmfs-csi) repository:
```bash
git clone https://github.com/cernops/cvmfs-csi.git
git clone https://github.com/cvmfs-contrib/cvmfs-csi.git
cd cvmfs-csi
```

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cernops/cvmfs-csi
module github.com/cvmfs-contrib/cvmfs-csi

go 1.20

Expand Down
4 changes: 2 additions & 2 deletions internal/cvmfs/automount/automount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"os/signal"
"syscall"

"github.com/cernops/cvmfs-csi/internal/exec"
"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/exec"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions internal/cvmfs/driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"strings"
"time"

"github.com/cernops/cvmfs-csi/internal/cvmfs/automount"
"github.com/cernops/cvmfs-csi/internal/cvmfs/controller"
"github.com/cernops/cvmfs-csi/internal/cvmfs/identity"
"github.com/cernops/cvmfs-csi/internal/cvmfs/node"
"github.com/cernops/cvmfs-csi/internal/grpcutils"
"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/automount"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/controller"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/identity"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/node"
"github.com/cvmfs-contrib/cvmfs-csi/internal/grpcutils"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"

"github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion internal/cvmfs/driver/grpclogger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"sync/atomic"

"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"

"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion internal/cvmfs/identity/csiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package identity
import (
"context"

"github.com/cernops/cvmfs-csi/internal/version"
"github.com/cvmfs-contrib/cvmfs-csi/internal/version"

"github.com/container-storage-interface/spec/lib/go/csi"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/cvmfs/node/csiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"os"
"path"

"github.com/cernops/cvmfs-csi/internal/cvmfs/singlemount"
singlemountv1 "github.com/cernops/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"
"github.com/cernops/cvmfs-csi/internal/mountutils"
"github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/singlemount"
singlemountv1 "github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"
"github.com/cvmfs-contrib/cvmfs-csi/internal/mountutils"

"github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes"
Expand Down
2 changes: 1 addition & 1 deletion internal/cvmfs/node/mountutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"bytes"
goexec "os/exec"

"github.com/cernops/cvmfs-csi/internal/exec"
"github.com/cvmfs-contrib/cvmfs-csi/internal/exec"
)

func bindMount(from, to string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/cvmfs/singlemount/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"time"

pb "github.com/cernops/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"
pb "github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"

"google.golang.org/grpc"
"google.golang.org/grpc/backoff"
Expand Down
4 changes: 2 additions & 2 deletions internal/cvmfs/singlemount/cvmfsexec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
goexec "os/exec"
"strings"

"github.com/cernops/cvmfs-csi/internal/exec"
"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/exec"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"
)

var cvmfsErrMessages = []string{
Expand Down
2 changes: 1 addition & 1 deletion internal/cvmfs/singlemount/grpclogger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"sync/atomic"

"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"

"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cvmfs/singlemount/pb/v1/spec.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
syntax = "proto3";
package cvmfs.csi.cern.ch.v1;

option go_package = "github.com/cernops/cvmfs-csi/internal/cvmfs/singlemount/pb/v1";
option go_package = "github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/singlemount/pb/v1";

// Single provides a service for mounting CVMFS repositories as private mounts.
// See https://cvmfs.readthedocs.io/en/stable/cpt-configure.html#private-mount-points
Expand Down
8 changes: 4 additions & 4 deletions internal/cvmfs/singlemount/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
goexec "os/exec"
"sync"

pb "github.com/cernops/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"
"github.com/cernops/cvmfs-csi/internal/exec"
"github.com/cernops/cvmfs-csi/internal/grpcutils"
"github.com/cernops/cvmfs-csi/internal/log"
pb "github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"
"github.com/cvmfs-contrib/cvmfs-csi/internal/exec"
"github.com/cvmfs-contrib/cvmfs-csi/internal/grpcutils"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
8 changes: 4 additions & 4 deletions internal/cvmfs/singlemount/sharedmount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
goexec "os/exec"
"path"

pb "github.com/cernops/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"
"github.com/cernops/cvmfs-csi/internal/exec"
"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cernops/cvmfs-csi/internal/mountutils"
pb "github.com/cvmfs-contrib/cvmfs-csi/internal/cvmfs/singlemount/pb/v1"
"github.com/cvmfs-contrib/cvmfs-csi/internal/exec"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/mountutils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"os/exec"
"sync/atomic"

"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"
)

// This file only provides wrappers around "os/exec" and logs the executed commands.
Expand Down
2 changes: 1 addition & 1 deletion internal/grpcutils/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"path"
"strings"

"github.com/cernops/cvmfs-csi/internal/log"
"github.com/cvmfs-contrib/cvmfs-csi/internal/log"

"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion scripts/changelog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ if ! [ -x "$(command -v github_changelog_generator)" ]; then
export PATH=$PATH:$(find ~/.gem -name bin | tail -1)
fi

github_changelog_generator -u cernops -p cvmfs-csi --token $GITHUB_TOKEN --since-tag $(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`)
github_changelog_generator -u cvmfs-contrib -p cvmfs-csi --token $GITHUB_TOKEN --since-tag $(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`)