diff --git a/Makefile b/Makefile index 2a4e603..1d09b84 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.4.1 +VERSION=v0.4.2 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/image/irods_fuse_build.dockerfile b/deploy/image/irods_fuse_build.dockerfile index 796b0f1..c0ae42e 100644 --- a/deploy/image/irods_fuse_build.dockerfile +++ b/deploy/image/irods_fuse_build.dockerfile @@ -15,7 +15,7 @@ LABEL description="iRODS FUSE Lite Build Image" WORKDIR /opt/ RUN git clone https://github.com/cyverse/irodsfs.git WORKDIR /opt/irodsfs -RUN git checkout tags/v0.3.3 +RUN git checkout tags/v0.3.4 # Build RUN make build \ No newline at end of file diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml index 9dbdb85..ebc310d 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.4.1 + newTag: v0.4.2 - 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 1a27aba..1facc56 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "0.4.1" +appVersion: "0.4.2" name: irods-csi-driver description: A Helm chart for iRODS CSI Driver -version: 0.4.1 +version: 0.4.2 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 81cb5b1..166c1f7 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.4.1 \ + --version 0.4.2 \ --namespace kube-system \ -f values.yaml ``` diff --git a/helm/values.yaml b/helm/values.yaml index 7195e88..2e27039 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -13,7 +13,7 @@ controllerService: irodsPlugin: image: repository: cyverse/irods-csi-driver - tag: v0.4.1 + tag: v0.4.2 pullPolicy: IfNotPresent extraArgs: @@ -53,7 +53,7 @@ nodeService: irodsPlugin: image: repository: cyverse/irods-csi-driver - tag: v0.4.1 + tag: v0.4.2 pullPolicy: IfNotPresent extraArgs: diff --git a/pkg/driver/irodsfs_config.go b/pkg/driver/irodsfs_config.go index 956ee1b..b5b9fad 100644 --- a/pkg/driver/irodsfs_config.go +++ b/pkg/driver/irodsfs_config.go @@ -19,6 +19,7 @@ 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 + ReadOnly bool `yaml:"read_only" json:"read_only"` CreateDir bool `yaml:"create_dir" json:"create_dir"` IgnoreNotExist bool `yaml:"ignore_not_exist" json:"ignore_not_exist"` }