Skip to content

Commit 0c39cc2

Browse files
authored
Merge pull request #18 from IBM/ashima
fix mount options
2 parents 6e2269e + d02ad33 commit 0c39cc2

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

config/crd/bases/objectdriver.csi.ibm.com_ibmobjectcsis.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,8 +943,10 @@ spec:
943943
repository:
944944
type: string
945945
resources:
946+
description: ResourcesSpec ...
946947
properties:
947948
limits:
949+
description: ReqLimits ...
948950
properties:
949951
cpu:
950952
type: string
@@ -955,6 +957,7 @@ spec:
955957
- memory
956958
type: object
957959
requests:
960+
description: ReqLimits ...
958961
properties:
959962
cpu:
960963
type: string
@@ -1921,8 +1924,10 @@ spec:
19211924
repository:
19221925
type: string
19231926
resources:
1927+
description: ResourcesSpec ...
19241928
properties:
19251929
limits:
1930+
description: ReqLimits ...
19261931
properties:
19271932
cpu:
19281933
type: string
@@ -1933,6 +1938,7 @@ spec:
19331938
- memory
19341939
type: object
19351940
requests:
1941+
description: ReqLimits ...
19361942
properties:
19371943
cpu:
19381944
type: string
@@ -1992,6 +1998,7 @@ spec:
19921998
type: object
19931999
sidecars:
19942000
items:
2001+
description: CSISidecar ...
19952002
properties:
19962003
imagePullPolicy:
19972004
description: The pullPolicy of the csi sidecar image
@@ -2003,8 +2010,10 @@ spec:
20032010
description: The repository of the csi sidecar image
20042011
type: string
20052012
resources:
2013+
description: ResourcesSpec ...
20062014
properties:
20072015
limits:
2016+
description: ReqLimits ...
20082017
properties:
20092018
cpu:
20102019
type: string
@@ -2015,6 +2024,7 @@ spec:
20152024
- memory
20162025
type: object
20172026
requests:
2027+
description: ReqLimits ...
20182028
properties:
20192029
cpu:
20202030
type: string

config/crd/bases/objectdriver.csi.ibm.com_recoverstalevolumes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ spec:
3838
metadata:
3939
type: object
4040
spec:
41+
description: RecoverStaleVolumeSpec defines the desired state of RecoverStaleVolume
4142
properties:
4243
deploymentData:
4344
items:
45+
description: DeploymentData ...
4446
properties:
4547
deploymentName:
4648
type: string

controllers/ibmobjectcsi_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ var (
379379
"parallel_count=8",
380380
"max_stat_cache_size=100000",
381381
"retries=5",
382-
"cache=kernel_cache",
382+
"kernel_cache",
383383
},
384384
Parameters: map[string]string{
385385
"mounter": "s3fs",

controllers/internal/crutils/static_resource_generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func (c *IBMObjectCSI) Generates3fsSC() *storagev1.StorageClass {
218218
"parallel_count=8",
219219
"max_stat_cache_size=100000",
220220
"retries=5",
221-
"cache=kernel_cache",
221+
"kernel_cache",
222222
},
223223
Parameters: map[string]string{
224224
"mounter": "s3fs",

0 commit comments

Comments
 (0)