Rename to just csi-s3
This commit is contained in:
parent
165b9d795f
commit
df04f577d2
9 changed files with 25 additions and 25 deletions
4
Makefile
4
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -21,7 +21,7 @@ import (
|
|||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/ctrox/csi-s3-driver/pkg/s3"
|
||||
"github.com/ctrox/csi-s3/pkg/s3"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -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)"
|
|
@ -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)"
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue