Reading node instance ID from node spec provider ID (#116)

* Reading node instance ID from node spec provider ID * Cleanup supported by csi-driver-registrar, removing manual cleanup
kubernetes-sigs · Feb 7, 2023 · cfb1567 · cfb1567
1 parent 7a5d8ca
commit cfb1567
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/deploy/kubernetes/driver/kubernetes/manifests/node-server.yaml b/deploy/kubernetes/driver/kubernetes/manifests/node-server.yaml
@@ -35,10 +35,6 @@ spec:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
             - "--kubelet-registration-path=$(DRIVER_REGISTRATION_SOCK)"
-          lifecycle:
-            preStop:
-              exec:
-                command: ["/bin/sh", "-c", "rm -rf /registration/vpc.block.csi.ibm.io /registration/vpc.block.csi.ibm.io-reg.sock"]
           env:
             - name: ADDRESS
               value: /csi/csi.sock

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/kubernetes-sigs/ibm-vpc-block-csi-driver
 go 1.18
 
 require (
-	github.com/IBM/ibm-csi-common v1.1.4
+	github.com/IBM/ibm-csi-common v1.1.5
 	github.com/IBM/ibmcloud-volume-interface v1.1.2
 	github.com/IBM/ibmcloud-volume-vpc v1.1.3
 	github.com/IBM/secret-utils-lib v1.1.2

diff --git a/go.sum b/go.sum
@@ -39,8 +39,8 @@ github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7 h1:eHgfQl6IeSmzWUyiSi13CvoFYsovoyq
 github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs=
 github.com/IBM/go-sdk-core/v5 v5.9.1 h1:06pXbD9Rgmqqe2HA5YAeQbB4eYRRFgIoOT+Kh3cp1zo=
 github.com/IBM/go-sdk-core/v5 v5.9.1/go.mod h1:axE2JrRq79gIJTjKPBwV6gWHswvVptBjbcvvCPIxARM=
-github.com/IBM/ibm-csi-common v1.1.4 h1:LXFFnzEeLy9/eUHBS6U6JtcVlxQnXhM2HWZVZJlxcTM=
-github.com/IBM/ibm-csi-common v1.1.4/go.mod h1:ylboxxpsAnVxFn35fBfhu6VFnl1YZa2LHgX0hMpujqw=
+github.com/IBM/ibm-csi-common v1.1.5 h1:hXCQ9xtO5Or5qhi5J5Ey7tfP0P+WpxPry1+u//z8xaw=
+github.com/IBM/ibm-csi-common v1.1.5/go.mod h1:ylboxxpsAnVxFn35fBfhu6VFnl1YZa2LHgX0hMpujqw=
 github.com/IBM/ibmcloud-volume-interface v1.1.2 h1:7IByqGhG09a3aycsf3TQn9vkQDncMJYdvpo4hGQAN5A=
 github.com/IBM/ibmcloud-volume-interface v1.1.2/go.mod h1:H6bm3Tzq7cjN0De207du/A8mzrirEgxwV89j3ouwCwg=
 github.com/IBM/ibmcloud-volume-vpc v1.1.3 h1:nYb45M8xnKz2ae8qnW77OIGTrxVmsKwxbvt71jd/wzw=

diff --git a/vendor/github.com/IBM/ibm-csi-common/pkg/metadata/metadata.go b/vendor/github.com/IBM/ibm-csi-common/pkg/metadata/metadata.go
diff --git a/vendor/github.com/IBM/ibm-csi-common/pkg/utils/constants.go b/vendor/github.com/IBM/ibm-csi-common/pkg/utils/constants.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -8,7 +8,7 @@ github.com/IBM-Cloud/ibm-cloud-cli-sdk/common/rest
 # github.com/IBM/go-sdk-core/v5 v5.9.1
 ## explicit; go 1.14
 github.com/IBM/go-sdk-core/v5/core
-# github.com/IBM/ibm-csi-common v1.1.4
+# github.com/IBM/ibm-csi-common v1.1.5
 ## explicit; go 1.18
 github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider
 github.com/IBM/ibm-csi-common/pkg/messages