From ea2ff584a147e8313d79b9ddcf5823ec15073f20 Mon Sep 17 00:00:00 2001
From: Cyrill Troxler <cyrilltroxler@gmail.com>
Date: Sun, 29 Jul 2018 14:49:35 +0200
Subject: [PATCH] Rename to just csi-s3
---
Makefile | 4 ++--
README.md | 6 ++---
cmd/s3driver/Dockerfile | 2 +-
cmd/s3driver/main.go | 2 +-
.../{csi-s3-driver.yaml => csi-s3.yaml} | 22 +++++++++----------
deploy/kubernetes/provisioner.yaml | 4 ++--
pkg/s3/s3-driver_suite_test.go | 2 +-
test/Dockerfile | 6 ++---
test/test.sh | 2 +-
9 files changed, 25 insertions(+), 25 deletions(-)
rename deploy/kubernetes/{csi-s3-driver.yaml => csi-s3.yaml} (92%)
diff --git a/Makefile b/Makefile
index 520f1e5..8b4d5e0 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,9 @@
# limitations under the License.
.PHONY: test build container push clean
-PROJECT_DIR=/go/src/github.com/ctrox/csi-s3-driver
+PROJECT_DIR=/go/src/github.com/ctrox/csi-s3
REGISTRY_NAME=ctrox
-IMAGE_NAME=csi-s3-driver
+IMAGE_NAME=csi-s3
IMAGE_VERSION=0.2.0
IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
TEST_IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):test
diff --git a/README.md b/README.md
index 0a2850c..6e671ce 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ stringData:
cd deploy/kubernetes
$ kubectl create -f provisioner.yaml
$ kubectl create -f attacher.yaml
-$ kubectl create -f csi-s3-driver.yaml
+$ kubectl create -f csi-s3.yaml
```
## 3. Create the storage class
@@ -121,13 +121,13 @@ $ kubectl logs -l app=csi-provisioner-s3 -c s3-csi-driver
* Ensure feature gate `MountPropagation` is not set to `false`
* Check the logs of the s3-driver:
```
-$ kubectl logs -l app=csi-s3-driver -c csi-s3-driver
+$ kubectl logs -l app=csi-s3 -c csi-s3
```
# Development
This project can be built like any other go application.
```bash
-$ go get -u github.com/ctrox/csi-s3-driver
+$ go get -u github.com/ctrox/csi-s3
```
## Build
```bash
diff --git a/cmd/s3driver/Dockerfile b/cmd/s3driver/Dockerfile
index e04a02e..918d998 100644
--- a/cmd/s3driver/Dockerfile
+++ b/cmd/s3driver/Dockerfile
@@ -39,7 +39,7 @@ RUN ./autogen.sh && \
FROM python:3.6-slim
LABEL maintainers="Cyrill Troxler <cyrilltroxler@gmail.com>"
-LABEL description="csi-s3-driver production image"
+LABEL description="csi-s3 production image"
RUN apt-get update && \
apt-get install -y \
diff --git a/cmd/s3driver/main.go b/cmd/s3driver/main.go
index 805804d..a57ac78 100644
--- a/cmd/s3driver/main.go
+++ b/cmd/s3driver/main.go
@@ -21,7 +21,7 @@ import (
"log"
"os"
- "github.com/ctrox/csi-s3-driver/pkg/s3"
+ "github.com/ctrox/csi-s3/pkg/s3"
)
func init() {
diff --git a/deploy/kubernetes/csi-s3-driver.yaml b/deploy/kubernetes/csi-s3.yaml
similarity index 92%
rename from deploy/kubernetes/csi-s3-driver.yaml
rename to deploy/kubernetes/csi-s3.yaml
index 3a548b0..f62b4d5 100644
--- a/deploy/kubernetes/csi-s3-driver.yaml
+++ b/deploy/kubernetes/csi-s3.yaml
@@ -2,12 +2,12 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: csi-s3-driver
+ name: csi-s3
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: csi-s3-driver
+ name: csi-s3
rules:
- apiGroups: [""]
resources: ["secrets"]
@@ -28,30 +28,30 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: csi-s3-driver
+ name: csi-s3
subjects:
- kind: ServiceAccount
- name: csi-s3-driver
+ name: csi-s3
namespace: default
roleRef:
kind: ClusterRole
- name: csi-s3-driver
+ name: csi-s3
apiGroup: rbac.authorization.k8s.io
---
kind: DaemonSet
apiVersion: apps/v1beta2
metadata:
- name: csi-s3-driver
+ name: csi-s3
spec:
selector:
matchLabels:
- app: csi-s3-driver
+ app: csi-s3
template:
metadata:
labels:
- app: csi-s3-driver
+ app: csi-s3
spec:
- serviceAccount: csi-s3-driver
+ serviceAccount: csi-s3
hostNetwork: true
containers:
- name: driver-registrar
@@ -69,13 +69,13 @@ spec:
volumeMounts:
- name: plugin-dir
mountPath: /csi
- - name: csi-s3-driver
+ - name: csi-s3
securityContext:
privileged: true
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
- image: ctrox/csi-s3-driver:0.2.0
+ image: ctrox/csi-s3:0.2.0
args:
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(NODE_ID)"
diff --git a/deploy/kubernetes/provisioner.yaml b/deploy/kubernetes/provisioner.yaml
index 8c0ea1e..dea5d6c 100644
--- a/deploy/kubernetes/provisioner.yaml
+++ b/deploy/kubernetes/provisioner.yaml
@@ -78,8 +78,8 @@ spec:
volumeMounts:
- name: socket-dir
mountPath: /var/lib/kubelet/plugins/ch.ctrox.csi.s3-driver
- - name: csi-s3-driver
- image: ctrox/csi-s3-driver:0.2.0
+ - name: csi-s3
+ image: ctrox/csi-s3:0.2.0
args:
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(NODE_ID)"
diff --git a/pkg/s3/s3-driver_suite_test.go b/pkg/s3/s3-driver_suite_test.go
index d19fd58..97504ca 100644
--- a/pkg/s3/s3-driver_suite_test.go
+++ b/pkg/s3/s3-driver_suite_test.go
@@ -8,7 +8,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "github.com/ctrox/csi-s3-driver/pkg/s3"
+ "github.com/ctrox/csi-s3/pkg/s3"
"github.com/kubernetes-csi/csi-test/pkg/sanity"
)
diff --git a/test/Dockerfile b/test/Dockerfile
index 4960962..52d0c62 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -1,6 +1,6 @@
-FROM ctrox/csi-s3-driver:0.2.0
+FROM ctrox/csi-s3:0.2.0
LABEL maintainers="Cyrill Troxler <cyrilltroxler@gmail.com>"
-LABEL description="csi-s3-driver testing image"
+LABEL description="csi-s3 testing image"
RUN apt-get update && \
apt-get install -y \
@@ -17,4 +17,4 @@ ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH
RUN go get -u github.com/minio/minio && go install github.com/minio/minio/cmd
-ENTRYPOINT ["/go/src/github.com/ctrox/csi-s3-driver/test/test.sh"]
+ENTRYPOINT ["/go/src/github.com/ctrox/csi-s3/test/test.sh"]
diff --git a/test/test.sh b/test/test.sh
index 0acf1ea..fafb5f5 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -5,4 +5,4 @@ export MINIO_SECRET_KEY=DSG643HGDS
mkdir -p /tmp/minio
minio server --quiet /tmp/minio &
sleep 5
-go test github.com/ctrox/csi-s3-driver/pkg/s3 -cover
+go test github.com/ctrox/csi-s3/pkg/s3 -cover