From 22581a6deffb9ce79870a4ffb40c9a0c07e51df8 Mon Sep 17 00:00:00 2001 From: Illyoung Choi Date: Mon, 5 Apr 2021 13:21:29 -0700 Subject: [PATCH 1/3] Use irodsfs v0.2.3, go-irodsclient v0.4.4 --- deploy/image/irods_fuse_build.dockerfile | 2 +- go.mod | 2 +- go.sum | 2 ++ pkg/driver/irodsfs_config.go | 8 +++++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deploy/image/irods_fuse_build.dockerfile b/deploy/image/irods_fuse_build.dockerfile index 85db3ea..8431f5e 100644 --- a/deploy/image/irods_fuse_build.dockerfile +++ b/deploy/image/irods_fuse_build.dockerfile @@ -15,7 +15,7 @@ LABEL description="iRODSFS (FUSE Client) Build Image" WORKDIR /opt/ RUN git clone https://github.com/cyverse/irodsfs.git WORKDIR /opt/irodsfs -RUN git checkout tags/v0.2.2 +RUN git checkout tags/v0.2.3 # Build RUN make build \ No newline at end of file diff --git a/go.mod b/go.mod index 4cfa1c3..ec7f5b2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/container-storage-interface/spec v1.2.0 - github.com/cyverse/go-irodsclient v0.4.0 + github.com/cyverse/go-irodsclient v0.4.4 github.com/golang/protobuf v1.4.2 // indirect github.com/kr/pretty v0.2.0 // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect diff --git a/go.sum b/go.sum index a988168..1a7fc48 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/cyverse/go-irodsclient v0.3.0 h1:8AZYPCkE0lQbVmMpGzqVu6m/xQiC7nvf5v3m github.com/cyverse/go-irodsclient v0.3.0/go.mod h1:Dv01ydAthODj/DDswb+JqH9z2oXOQ1WFtwoZeIEfQX8= github.com/cyverse/go-irodsclient v0.4.0 h1:T/bwDDwH7fCe41ywX9cKsd/3uhut5iZoXKCiORp/ID4= github.com/cyverse/go-irodsclient v0.4.0/go.mod h1:Dv01ydAthODj/DDswb+JqH9z2oXOQ1WFtwoZeIEfQX8= +github.com/cyverse/go-irodsclient v0.4.4 h1:vMM1/ogC/gqMHDtavi/+yv9MUQ9u16tnAePIEK0HAp8= +github.com/cyverse/go-irodsclient v0.4.4/go.mod h1:Dv01ydAthODj/DDswb+JqH9z2oXOQ1WFtwoZeIEfQX8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/pkg/driver/irodsfs_config.go b/pkg/driver/irodsfs_config.go index 165b6fe..62a227e 100644 --- a/pkg/driver/irodsfs_config.go +++ b/pkg/driver/irodsfs_config.go @@ -14,9 +14,11 @@ const ( // PathMapping ... type IRODSFSPathMapping struct { - IRODSPath string `yaml:"irods_path" json:"irods_path"` - MappingPath string `yaml:"mapping_path" json:"mapping_path"` - ResourceType string `yaml:"resource_type" json:"resource_type"` // file or dir + IRODSPath string `yaml:"irods_path" json:"irods_path"` + MappingPath string `yaml:"mapping_path" json:"mapping_path"` + ResourceType string `yaml:"resource_type" json:"resource_type"` // file or dir + CreateDir bool `yaml:"create_dir" json:"create_dir"` + IgnoreNotExist bool `yaml:"ignore_not_exist" json:"ignore_not_exist"` } type IRODSFSConfig struct { From baf2ed3c6b8366f86096c58a6fb2e692f10d123f Mon Sep 17 00:00:00 2001 From: Illyoung Choi Date: Mon, 5 Apr 2021 13:24:19 -0700 Subject: [PATCH 2/3] Bump up version to v0.3.1 --- Makefile | 2 +- deploy/kubernetes/overlays/stable/kustomization.yaml | 2 +- helm/Chart.yaml | 4 ++-- helm/README.md | 2 +- helm/values.yaml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c25ea6e..7d92d99 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ FUSE_CLIENT_BUILD_IMAGE=irods_fuse_client_build FUSE_CLIENT_BUILD_DOCKERFILE=deploy/image/irods_fuse_build.dockerfile CSI_DRIVER_IMAGE?=cyverse/irods-csi-driver CSI_DRIVER_DOCKERFILE=deploy/image/irods_csi_driver_image.dockerfile -VERSION=v0.3.0 +VERSION=v0.3.1 GIT_COMMIT?=$(shell git rev-parse HEAD) BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE}" diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml index 662f444..c0e3a34 100644 --- a/deploy/kubernetes/overlays/stable/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/kustomization.yaml @@ -4,7 +4,7 @@ bases: - ../../base images: - name: cyverse/irods-csi-driver - newTag: v0.3.0 + newTag: v0.3.1 - name: quay.io/k8scsi/csi-provisioner newTag: v1.6.0 - name: quay.io/k8scsi/livenessprobe diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 7acd9ea..b6fb352 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "0.3.0" +appVersion: "0.3.1" name: irods-csi-driver description: A Helm chart for iRODS CSI Driver -version: 0.3.0 +version: 0.3.1 kubeVersion: ">=1.14.0-0" home: https://github.com/cyverse/irods-csi-driver sources: diff --git a/helm/README.md b/helm/README.md index e2155ca..3475147 100644 --- a/helm/README.md +++ b/helm/README.md @@ -38,7 +38,7 @@ helm install irods-csi-driver -f user_values.yaml --namespace kube-system . ```shell script helm upgrade irods-csi-driver \ --install . \ - --version 0.3.0 \ + --version 0.3.1 \ --namespace kube-system \ -f values.yaml ``` diff --git a/helm/values.yaml b/helm/values.yaml index bb38bbd..0ee61e3 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -13,7 +13,7 @@ controllerService: irodsPlugin: image: repository: cyverse/irods-csi-driver - tag: v0.3.0 + tag: v0.3.1 pullPolicy: IfNotPresent extraArgs: @@ -53,7 +53,7 @@ nodeService: irodsPlugin: image: repository: cyverse/irods-csi-driver - tag: v0.3.0 + tag: v0.3.1 pullPolicy: IfNotPresent extraArgs: From 92282b5a03208147fabf3c00a18695981d0d9397 Mon Sep 17 00:00:00 2001 From: Illyoung Choi Date: Mon, 5 Apr 2021 13:36:14 -0700 Subject: [PATCH 3/3] Fix compilation error caused by new API of go-irodsclient --- pkg/driver/irods_operation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/driver/irods_operation.go b/pkg/driver/irods_operation.go index 96e2a42..2952a31 100644 --- a/pkg/driver/irods_operation.go +++ b/pkg/driver/irods_operation.go @@ -53,7 +53,7 @@ func IRODSTestConnection(conn *IRODSConnectionInfo) error { } oneMin := 1 * time.Minute - fsConfig := fs.NewFileSystemConfig(applicationName, oneMin, oneMin, 1, oneMin, oneMin) + fsConfig := fs.NewFileSystemConfig(applicationName, oneMin, oneMin, 1, oneMin, oneMin, true) filesystem, err := fs.NewFileSystem(account, fsConfig) if err != nil { return err