ivampiresp/longhorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve the conflicting files from master

Browse Source 
Signed-off-by: David Ko <dko@suse.com>
This commit is contained in:
David Ko 2021-10-08 13:25:46 +08:00
commit b6b6e4824d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deploy/longhorn.yaml
View File

@ -957,6 +957,7 @@ data:
numberOfReplicas: "3" numberOfReplicas: "3"
staleReplicaTimeout: "2880" staleReplicaTimeout: "2880"
fromBackup: "" fromBackup: ""
fsType: "ext4"
# backingImage: "bi-test" # backingImage: "bi-test"
# backingImageDataSourceType: "download" # backingImageDataSourceType: "download"
# backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}' # backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}'

1
examples/storageclass.yaml
View File

@ -10,6 +10,7 @@ parameters:
numberOfReplicas: "2" numberOfReplicas: "2"
staleReplicaTimeout: "2880" staleReplicaTimeout: "2880"
fromBackup: "" fromBackup: ""
fsType: "ext4"
# backingImage: "bi-test" # backingImage: "bi-test"
# backingImageDataSourceType: "download" # backingImageDataSourceType: "download"
# backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}' # backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}'