diff --git a/cmd/iscsiplugin/main.go b/cmd/iscsiplugin/main.go index 47a8b2d7..0236b158 100644 --- a/cmd/iscsiplugin/main.go +++ b/cmd/iscsiplugin/main.go @@ -41,7 +41,7 @@ func main() { flag.CommandLine.Parse([]string{}) cmd := &cobra.Command{ - Use: "ISCSI", + Use: "iscsi.csi.k8s.io", Short: "CSI based ISCSI driver", Run: func(cmd *cobra.Command, args []string) { handle() diff --git a/deploy/csi-iscsi-driverinfo.yaml b/deploy/csi-iscsi-driverinfo.yaml index 83ae3b9c..ea014624 100644 --- a/deploy/csi-iscsi-driverinfo.yaml +++ b/deploy/csi-iscsi-driverinfo.yaml @@ -1,5 +1,5 @@ --- -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: name: iscsi.csi.k8s.io diff --git a/deploy/csi-iscsi-node.yaml b/deploy/csi-iscsi-node.yaml index 139dc4a1..c3979d89 100644 --- a/deploy/csi-iscsi-node.yaml +++ b/deploy/csi-iscsi-node.yaml @@ -39,10 +39,6 @@ spec: memory: 20Mi - name: node-driver-registrar image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 - lifecycle: - preStop: - exec: - command: ["/bin/sh", "-c", "rm -rf /registration/iscsi.csi.k8s.io /registration/iscsi.csi.k8s.io-reg.sock"] args: - --v=2 - --csi-address=/csi/csi.sock @@ -63,7 +59,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/humble/csi-iscsi:v0.1 + image: quay.io/humble/csi-iscsi:v0.2 args: - "-v=5" - "--nodeid=$(NODE_ID)" diff --git a/deploy/install-driver.sh b/deploy/install-driver.sh index fc4054e6..5ef981cb 100755 --- a/deploy/install-driver.sh +++ b/deploy/install-driver.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2020 The Kubernetes Authors. +# Copyright 2021 The Kubernetes Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,8 @@ if [[ "$#" -gt 0 ]]; then ver="$1" fi -repo="https://raw.githubusercontent.com/kubernetes-csi/csi-driver-iscsi/$ver/deploy" +#repo="https://raw.githubusercontent.com/kubernetes-csi/csi-driver-iscsi/$ver/deploy" +repo="./deploy" if [[ "$#" -gt 1 ]]; then if [[ "$2" == *"local"* ]]; then echo "use local deploy" @@ -33,7 +34,7 @@ if [ $ver != "master" ]; then repo="$repo/$ver" fi -echo "Installing iscsi CSI driver, version: $ver ..." +echo "Installing iscsi.csi.k8s.io CSI driver, version: $ver ..." kubectl apply -f $repo/csi-iscsi-driverinfo.yaml kubectl apply -f $repo/csi-iscsi-node.yaml -echo 'iscsi CSI driver installed successfully.' +echo 'iscsi.csi.k8s.io CSI driver installed successfully.' diff --git a/examples/kubernetes/pv.yaml b/examples/kubernetes/pv.yaml index e7c452ae..287cc6f4 100644 --- a/examples/kubernetes/pv.yaml +++ b/examples/kubernetes/pv.yaml @@ -11,7 +11,7 @@ spec: capacity: storage: 1Gi csi: - driver: ISCSI + driver: iscsi.csi.k8s.io volumeHandle: iscsi-data-id volumeAttributes: targetPortal: "192.168.122.145:3260"