diff --git a/Makefile b/Makefile index 21f689d..f4f77af 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CSI_DRIVER_IMAGE?=cyverse/irods-csi-driver CSI_DRIVER_DOCKERFILE=deploy/image/irods_csi_driver_image.dockerfile CSI_DRIVER_POOL_IMAGE?=cyverse/irods-csi-driver-pool CSI_DRIVER_POOL_DOCKERFILE=deploy/image/irods_csi_driver_pool_image.dockerfile -VERSION=v0.9.4 +VERSION=v0.9.5 GIT_COMMIT?=$(shell git rev-parse HEAD) BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") LDFLAGS?="-X ${PKG}/pkg/common.driverVersion=${VERSION} -X ${PKG}/pkg/common.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/common.buildDate=${BUILD_DATE}" diff --git a/deploy/image/irods_csi_driver_image.dockerfile b/deploy/image/irods_csi_driver_image.dockerfile index 9a513dc..7238c16 100644 --- a/deploy/image/irods_csi_driver_image.dockerfile +++ b/deploy/image/irods_csi_driver_image.dockerfile @@ -16,7 +16,7 @@ ARG CSI_DRIVER_SRC_DIR="/go/src/github.com/cyverse/irods-csi-driver" ARG IRODS_FUSE_DIR="/opt/irodsfs" ARG FUSE_NFS_DIR="/opt/fuse-nfs" ARG DEBIAN_FRONTEND=noninteractive -ARG IRODSFS_VER=v0.8.11 +ARG IRODSFS_VER=v0.8.13 # Setup Utility Packages RUN apt-get update && \ diff --git a/deploy/image/irods_csi_driver_pool_image.dockerfile b/deploy/image/irods_csi_driver_pool_image.dockerfile index af004a0..f67f578 100644 --- a/deploy/image/irods_csi_driver_pool_image.dockerfile +++ b/deploy/image/irods_csi_driver_pool_image.dockerfile @@ -12,7 +12,7 @@ LABEL version="0.1" LABEL description="iRODS CSI Driver Pool Image" ARG DEBIAN_FRONTEND=noninteractive -ARG IRODSFS_POOL_VER=v0.6.10 +ARG IRODSFS_POOL_VER=v0.6.12 # Setup Utility Packages RUN apt-get update && \ diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml index 4e63687..e8cd86f 100644 --- a/deploy/kubernetes/overlays/stable/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/kustomization.yaml @@ -4,9 +4,9 @@ bases: - ../../base images: - name: cyverse/irods-csi-driver - newTag: v0.9.4 + newTag: v0.9.5 - name: cyverse/irods-csi-driver-pool - newTag: v0.9.4 + newTag: v0.9.5 - name: quay.io/k8scsi/csi-provisioner newTag: v1.6.0 - name: quay.io/k8scsi/livenessprobe diff --git a/go.mod b/go.mod index 6a8dcfe..daa820a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/container-storage-interface/spec v1.2.0 - github.com/cyverse/go-irodsclient v0.10.4 + github.com/cyverse/go-irodsclient v0.12.2 github.com/prometheus/client_golang v1.13.0 github.com/rs/xid v1.3.0 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 @@ -28,7 +28,7 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect + golang.org/x/sys v0.8.0 // indirect golang.org/x/text v0.7.0 // indirect google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/go.sum b/go.sum index fe55aa7..d8159ee 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/container-storage-interface/spec v1.2.0 h1:bD9KIVgaVKKkQ/UbVUY9kCaH/CJbhNxe0eeB4JeJV2s= github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4= -github.com/cyverse/go-irodsclient v0.10.4 h1:nj+R5n4dI9Jh1wlfjWnFzGeQltGKMxPfmLAsN08fwNU= -github.com/cyverse/go-irodsclient v0.10.4/go.mod h1:UaBJ8f9cRQYx3kkmbfWMDlZGQ4AF5k5oV2X27BGiO4o= +github.com/cyverse/go-irodsclient v0.12.2 h1:5EuoJtBY3IZtWz9FwhqBFCuUZ4V+LsASTK2fFdXYHrU= +github.com/cyverse/go-irodsclient v0.12.2/go.mod h1:SOMr0JtAmbtYp06ZdYhxBYi47GYpV9ImW7sqKVypQhU= 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= @@ -355,8 +355,8 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index c89b746..4c05d29 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "0.9.4" +appVersion: "0.9.5" name: irods-csi-driver description: A Helm chart for iRODS CSI Driver -version: 0.9.4 +version: 0.9.5 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 b0da701..ce962f3 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.9.4 \ + --version 0.9.5 \ --namespace kube-system \ -f values.yaml ``` diff --git a/helm/values.yaml b/helm/values.yaml index c9fb20e..14fc3c3 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -13,7 +13,7 @@ controllerService: irodsPlugin: image: repository: cyverse/irods-csi-driver - tag: v0.9.4 + tag: v0.9.5 pullPolicy: Always extraArgs: @@ -53,7 +53,7 @@ nodeService: irodsPlugin: image: repository: cyverse/irods-csi-driver - tag: v0.9.4 + tag: v0.9.5 pullPolicy: Always extraArgs: @@ -68,7 +68,7 @@ nodeService: irodsPool: image: repository: cyverse/irods-csi-driver-pool - tag: v0.9.4 + tag: v0.9.5 pullPolicy: Always extraArgs: diff --git a/pkg/client/irods/operations.go b/pkg/client/irods/operations.go index 8c3d2d8..e1ffd81 100644 --- a/pkg/client/irods/operations.go +++ b/pkg/client/irods/operations.go @@ -54,7 +54,8 @@ func TestConnection(conn *IRODSFSConnectionInfo) error { oneMin := 1 * time.Minute oneHour := 1 * time.Hour - fsConfig := irodsclient_fs.NewFileSystemConfig(applicationName, oneHour, oneMin, oneMin, 1, oneMin, oneMin, nil, true, false) + fourMB := 4 * 1024 * 1024 + fsConfig := irodsclient_fs.NewFileSystemConfig(applicationName, oneHour, oneMin, oneMin, 1, fourMB, oneMin, oneMin, nil, true, false) filesystem, err := irodsclient_fs.NewFileSystem(account, fsConfig) if err != nil { return err