Skip to content

Commit

Permalink
Module name changed to sigs.k8s.io/ibm-powervs-block-csi-driver
Browse files Browse the repository at this point in the history
  • Loading branch information
rcmadhankumar committed Jan 5, 2022
1 parent 308a03b commit 95e5af6
Show file tree
Hide file tree
Showing 45 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
- name: Build
run: |
mkdir -p bin
make bin/powervs-csi-driver
make bin/ibm-powervs-block-csi-driver
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
#FROM golang:1.15-buster AS builder
#WORKDIR /go/src/github.com/ppc64le-cloud/powervs-csi-driver
#WORKDIR /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver
#COPY . .
#RUN make

FROM --platform=linux/ppc64le k8s.gcr.io/build-image/debian-base:v2.1.3 AS debian-base
RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs
RUN clean-install bash multipath-tools sg3-utils
# COPY --from=builder /go/src/github.com/ppc64le-cloud/powervs-csi-driver/bin/powervs-csi-driver /bin/powervs-csi-driver
COPY ./bin/powervs-csi-driver /bin/powervs-csi-driver
# COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver
COPY ./bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver

ENTRYPOINT ["/bin/powervs-csi-driver"]
ENTRYPOINT ["/bin/ibm-powervs-block-csi-driver"]

FROM --platform=linux/ppc64le registry.access.redhat.com/ubi8/ubi:8.5 AS rhel-base
RUN yum --disableplugin=subscription-manager -y install httpd php \
&& yum --disableplugin=subscription-manager clean all
RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs
# COPY --from=builder /go/src/github.com/ppc64le-cloud/powervs-csi-driver/bin/powervs-csi-driver /bin/powervs-csi-driver
COPY ./bin/powervs-csi-driver /bin/powervs-csi-driver
# COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver
COPY ./bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver

ENTRYPOINT ["/bin/powervs-csi-driver"]
ENTRYPOINT ["/bin/ibm-powervs-block-csi-driver"]
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

PKG=github.com/ppc64le-cloud/powervs-csi-driver
IMAGE?=quay.io/powercloud/powervs-csi-driver
PKG=sigs.k8s.io/ibm-powervs-block-csi-driver
IMAGE?=quay.io/powercloud/ibm-powervs-block-csi-driver
VERSION=v0.0.1
GIT_COMMIT?=$(shell git rev-parse HEAD)
BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
Expand All @@ -27,9 +27,9 @@ PLATFORM=linux/ppc64le

.EXPORT_ALL_VARIABLES:

.PHONY: bin/powervs-csi-driver
bin/powervs-csi-driver: | bin
CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -ldflags ${LDFLAGS} -o bin/powervs-csi-driver ./cmd/
.PHONY: bin/ibm-powervs-block-csi-driver
bin/ibm-powervs-block-csi-driver: | bin
CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -ldflags ${LDFLAGS} -o bin/ibm-powervs-block-csi-driver ./cmd/

.PHONY: test
test:
Expand All @@ -41,7 +41,7 @@ image-release:

.PHONY: image
image:
docker build -t $(IMAGE):latest . --target debian-base
docker build -t $(IMAGE):$(VERSION) . --target debian-base

.PHONY: push-release
push-release:
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ package main
import (
"flag"

"github.com/ppc64le-cloud/powervs-csi-driver/pkg/driver"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/driver"

"k8s.io/klog/v2"
)

func main() {
fs := flag.NewFlagSet("powervs-csi-driver", flag.ExitOnError)
fs := flag.NewFlagSet("ibm-powervs-block-csi-driver", flag.ExitOnError)
options := GetOptions(fs)

drv, err := driver.NewDriver(
Expand Down
4 changes: 2 additions & 2 deletions cmd/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"os"
"strings"

"github.com/ppc64le-cloud/powervs-csi-driver/cmd/options"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/driver"
"sigs.k8s.io/ibm-powervs-block-csi-driver/cmd/options"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/driver"

"k8s.io/klog/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/options/server_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package options
import (
"flag"

"github.com/ppc64le-cloud/powervs-csi-driver/pkg/driver"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/driver"
)

// ServerOptions contains options and configuration settings for the driver server.
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrole-attacher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: powervs-external-attacher-role
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrole-csi-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: powervs-node-role
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
rules:
- apiGroups: [""]
resources: ["nodes"]
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrole-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: powervs-external-provisioner-role
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrole-resizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
metadata:
name: powervs-external-resizer-role
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
rules:
# The following rule should be uncommented for plugins that require secrets
# for provisioning.
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrolebinding-attacher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: powervs-csi-attacher-binding
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
subjects:
- kind: ServiceAccount
name: powervs-csi-controller-sa
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrolebinding-csi-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: powervs-csi-node-getter-binding
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
subjects:
- kind: ServiceAccount
name: powervs-csi-node-sa
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrolebinding-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: powervs-csi-provisioner-binding
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
subjects:
- kind: ServiceAccount
name: powervs-csi-controller-sa
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/clusterrolebinding-resizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
metadata:
name: powervs-csi-resizer-binding
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
subjects:
- kind: ServiceAccount
name: powervs-csi-controller-sa
Expand Down
8 changes: 4 additions & 4 deletions deploy/kubernetes/base/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ metadata:
name: powervs-csi-controller
namespace: kube-system
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
spec:
replicas: 1
selector:
matchLabels:
app: powervs-csi-controller
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
template:
metadata:
labels:
app: powervs-csi-controller
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
spec:
nodeSelector:
kubernetes.io/os: linux
Expand All @@ -26,7 +26,7 @@ spec:
- operator: Exists
containers:
- name: powervs-plugin
image: quay.io/powercloud/powervs-csi-driver:v0.0.1
image: quay.io/powercloud/ibm-powervs-block-csi-driver:v0.0.1
imagePullPolicy: Always
args:
# - {all,controller,node} # specify the driver mode
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/csidriver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CSIDriver
metadata:
name: powervs.csi.ibm.com
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
spec:
attachRequired: true
podInfoOnMount: false
8 changes: 4 additions & 4 deletions deploy/kubernetes/base/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ metadata:
name: powervs-csi-node
namespace: kube-system
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
spec:
selector:
matchLabels:
app: powervs-csi-node
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
template:
metadata:
labels:
app: powervs-csi-node
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
spec:
nodeSelector:
kubernetes.io/os: linux
Expand All @@ -28,7 +28,7 @@ spec:
- name: powervs-plugin
securityContext:
privileged: true
image: quay.io/powercloud/powervs-csi-driver:v0.0.1
image: quay.io/powercloud/ibm-powervs-block-csi-driver:v0.0.1
imagePullPolicy: Always
args:
- node
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/serviceaccount-csi-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
name: powervs-csi-controller-sa
namespace: kube-system
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/serviceaccount-csi-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
name: powervs-csi-node-sa
namespace: kube-system
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
8 changes: 4 additions & 4 deletions deploy/kubernetes/overlays/dev/main_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ metadata:
name: powervs-csi-node
namespace: kube-system
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
spec:
template:
spec:
containers:
- name: powervs-plugin
image: quay.io/powercloud/powervs-csi-driver:dev
image: quay.io/powercloud/ibm-powervs-block-csi-driver:dev
imagePullPolicy: Always
---
kind: Deployment
Expand All @@ -19,11 +19,11 @@ metadata:
name: powervs-csi-controller
namespace: kube-system
labels:
app.kubernetes.io/name: powervs-csi-driver
app.kubernetes.io/name: ibm-powervs-block-csi-driver
spec:
template:
spec:
containers:
- name: powervs-plugin
image: quay.io/powercloud/powervs-csi-driver:dev
image: quay.io/powercloud/ibm-powervs-block-csi-driver:dev
imagePullPolicy: Always
2 changes: 1 addition & 1 deletion deploy/kubernetes/overlays/stable/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kustomization
bases:
- ../../base
images:
- name: quay.io/powercloud/powervs-csi-driver
- name: quay.io/powercloud/ibm-powervs-block-csi-driver
newTag: v0.0.1
- name: k8s.gcr.io/sig-storage/csi-provisioner
newTag: v3.0.0
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/dynamic-provisioning/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This example shows how to create a PowerVS volume and consume it from container

1. Kubernetes 1.13+ (CSI 1.0).

2. The [powervs-ebs-csi-driver](https://github.com/ppc64le-cloud/powervs-csi-driver) is installed.
2. The [powervs-ebs-csi-driver](https://sigs.k8s.io/ibm-powervs-block-csi-driver) is installed.

## Usage

Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/storageclass/Readme.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Configuring StorageClass
This example shows how to configure Kubernetes storageclass to provision PowerVS volumes with various configuration parameters. PowerVS CSI driver is compatiable with in-tree PowerVS plugin on StorageClass parameters.
This example shows how to configure Kubernetes storageclass to provision PowerVS volumes with various configuration parameters. IBM PowerVS Block CSI Driver is compatiable with in-tree PowerVS plugin on StorageClass parameters.

## Usage
1. Edit the StorageClass spec in [example manifest](./specs/example.yaml) and update storageclass parameters to desired value. In this example, a `tier1` PowerVS volume will be created and formatted to `xfs` filesystem.
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/ppc64le-cloud/powervs-csi-driver
module sigs.k8s.io/ibm-powervs-block-csi-driver

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package cloud
import (
"errors"

"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
)

// PowerVS volume types
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/powervs.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
"github.com/IBM-Cloud/power-go-client/power/models"
"github.com/davecgh/go-spew/spew"
"github.com/golang-jwt/jwt"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/utils/pointer"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
)

var _ Cloud = &powerVSCloud{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/driver/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"strings"

csi "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/cloud"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"k8s.io/klog/v2"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/cloud"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"net"

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
"google.golang.org/grpc"
"k8s.io/klog/v2"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
)

// Mode is the operating mode of the CSI driver.
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"os"
goexec "os/exec"

"github.com/ppc64le-cloud/powervs-csi-driver/pkg/fibrechannel"
"k8s.io/klog/v2"
"k8s.io/utils/exec"
"k8s.io/utils/mount"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/fibrechannel"
)

// Mounter is an interface for mount operations
Expand Down
6 changes: 3 additions & 3 deletions pkg/driver/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import (
"strings"

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/cloud"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/fibrechannel"
"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"k8s.io/klog/v2"
mountutils "k8s.io/mount-utils"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/cloud"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/fibrechannel"
"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
)

const (
Expand Down
Loading

0 comments on commit 95e5af6

Please sign in to comment.