From 754ae2b8890a98500f3cfcf35e3ae8437b3affe9 Mon Sep 17 00:00:00 2001 From: JenTing Hsiao Date: Thu, 2 Sep 2021 13:01:03 +0800 Subject: [PATCH 1/6] Helm chart doesn't allow `-xxx` as a valid version - Unless we add `-0`, see helm/helm#9371 for details. - Besides that, the semver parser doesn't allow with prefix `v`. Remove the prefix `v`. https://github.com/rancher/rancher/blob/release/v2.5.9/pkg/catalog/manager/manager.go#L218-L221 Longhorn 2963 Signed-off-by: JenTing Hsiao --- chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index ca33e39..4b3c3cd 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: longhorn version: 1.2.0 appVersion: v1.2.0 -kubeVersion: ">=v1.18.0" +kubeVersion: ">=1.18.0-0" description: Longhorn is a distributed block storage system for Kubernetes. keywords: - longhorn From 83242d336e5831073e2cc6dd6c659f701aa36da6 Mon Sep 17 00:00:00 2001 From: JenTing Hsiao Date: Thu, 2 Sep 2021 10:23:10 +0800 Subject: [PATCH 2/6] Remove duplicate item in Chart sources Signed-off-by: JenTing Hsiao --- chart/Chart.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 4b3c3cd..d898eef 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -18,7 +18,6 @@ sources: - https://github.com/longhorn/longhorn-engine - https://github.com/longhorn/longhorn-instance-manager - https://github.com/longhorn/longhorn-share-manager -- https://github.com/longhorn/backing-image-manager - https://github.com/longhorn/longhorn-manager - https://github.com/longhorn/longhorn-ui - https://github.com/longhorn/longhorn-tests From d07b05ce292ff2a6100228d9e9745ed67299af79 Mon Sep 17 00:00:00 2001 From: phanle1010 Date: Thu, 2 Sep 2021 11:17:07 -0700 Subject: [PATCH 3/6] Explicitly set default fsType to EXT4 This allow Kubernetes to properly changes the volume ownership and permissions when user specify fsGroup in workload pod Longhorn-2964 Signed-off-by: phanle1010 (cherry picked from commit f2856cd358007d9409fdfec5dbcb8094bc085c2f) --- chart/templates/storageclass.yaml | 3 +++ chart/values.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/chart/templates/storageclass.yaml b/chart/templates/storageclass.yaml index fd2dde5..78ae33d 100644 --- a/chart/templates/storageclass.yaml +++ b/chart/templates/storageclass.yaml @@ -20,6 +20,9 @@ data: numberOfReplicas: "{{ .Values.persistence.defaultClassReplicaCount }}" staleReplicaTimeout: "30" fromBackup: "" + {{- if .Values.persistence.defaultFsType }} + fsType: "{{.Values.persistence.defaultFsType}}" + {{- end }} {{- if .Values.persistence.backingImage.enable }} backingImage: {{ .Values.persistence.backingImage.name }} backingImageDataSourceType: {{ .Values.persistence.backingImage.dataSourceType }} diff --git a/chart/values.yaml b/chart/values.yaml index c9d90fb..40672cb 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -53,6 +53,7 @@ service: persistence: defaultClass: true + defaultFsType: ext4 defaultClassReplicaCount: 3 reclaimPolicy: Delete recurringJobSelector: From b7910161fce8826ee5e1ad50c72a64f7d09bbfaa Mon Sep 17 00:00:00 2001 From: David Ko Date: Mon, 6 Sep 2021 12:39:50 +0800 Subject: [PATCH 4/6] Add fstype in the longhorn.yaml and example sc Signed-off-by: David Ko --- deploy/longhorn.yaml | 1 + examples/storageclass.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 55db063..41c22a3 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -954,6 +954,7 @@ data: numberOfReplicas: "3" staleReplicaTimeout: "2880" fromBackup: "" + fsType: "ext4" # backingImage: "bi-test" # backingImageDataSourceType: "download" # backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}' diff --git a/examples/storageclass.yaml b/examples/storageclass.yaml index 0a5e3bb..e3cf696 100644 --- a/examples/storageclass.yaml +++ b/examples/storageclass.yaml @@ -10,6 +10,7 @@ parameters: numberOfReplicas: "2" staleReplicaTimeout: "2880" fromBackup: "" + fsType: "ext4" # backingImage: "bi-test" # backingImageDataSourceType: "download" # backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}' From 1e6c75413c94bd25883a9b3b7d964d9bd5b95158 Mon Sep 17 00:00:00 2001 From: Joshua Moody Date: Tue, 14 Sep 2021 13:08:13 +0200 Subject: [PATCH 5/6] Update share-manager image to v1_20210914 This fixes the previously created RWX volumes that were marked as XFS but got created as EXT4 since we only supported EXT4 at the time. Longhorn #2991 Signed-off-by: Joshua Moody --- chart/questions.yml | 2 +- chart/values.yaml | 2 +- deploy/longhorn-images.txt | 2 +- deploy/longhorn.yaml | 2 +- deploy/release-images.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chart/questions.yml b/chart/questions.yml index 128b070..93f0677 100644 --- a/chart/questions.yml +++ b/chart/questions.yml @@ -65,7 +65,7 @@ questions: label: Longhorn Share Manager Image Repository group: "Longhorn Images Settings" - variable: image.longhorn.shareManager.tag - default: v1_20210820 + default: v1_20210914 description: "Specify Longhorn Share Manager Image Tag" type: string label: Longhorn Share Manager Image Tag diff --git a/chart/values.yaml b/chart/values.yaml index 40672cb..2cdd0cb 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -21,7 +21,7 @@ image: tag: v1_20210731 shareManager: repository: longhornio/longhorn-share-manager - tag: v1_20210820 + tag: v1_20210914 backingImageManager: repository: longhornio/backing-image-manager tag: v2_20210820 diff --git a/deploy/longhorn-images.txt b/deploy/longhorn-images.txt index 67de33a..75fe198 100644 --- a/deploy/longhorn-images.txt +++ b/deploy/longhorn-images.txt @@ -7,5 +7,5 @@ longhornio/backing-image-manager:v2_20210820 longhornio/longhorn-engine:v1.2.0 longhornio/longhorn-instance-manager:v1_20210731 longhornio/longhorn-manager:v1.2.0 -longhornio/longhorn-share-manager:v1_20210820 +longhornio/longhorn-share-manager:v1_20210914 longhornio/longhorn-ui:v1.2.0 diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 41c22a3..60e590d 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -995,7 +995,7 @@ spec: - --instance-manager-image - longhornio/longhorn-instance-manager:v1_20210731 - --share-manager-image - - longhornio/longhorn-share-manager:v1_20210820 + - longhornio/longhorn-share-manager:v1_20210914 - --backing-image-manager-image - longhornio/backing-image-manager:v2_20210820 - --manager-image diff --git a/deploy/release-images.txt b/deploy/release-images.txt index 35f8d3b..450dcde 100644 --- a/deploy/release-images.txt +++ b/deploy/release-images.txt @@ -7,5 +7,5 @@ longhornio/backing-image-manager:v1_20210422 longhornio/longhorn-engine:v1.1.2 longhornio/longhorn-instance-manager:v1_20210621 longhornio/longhorn-manager:v1.1.2 -longhornio/longhorn-share-manager:v1_20210416 +longhornio/longhorn-share-manager:v1_20210914 longhornio/longhorn-ui:v1.1.2 From e98b0992b32cce7a3bbd0bb0ac13dc6064562661 Mon Sep 17 00:00:00 2001 From: phanle1010 Date: Thu, 16 Sep 2021 10:18:11 -0700 Subject: [PATCH 6/6] Remove release-images.txt because it is duplication of longhorn-images.txt Signed-off-by: phanle1010 --- deploy/release-images.txt | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 deploy/release-images.txt diff --git a/deploy/release-images.txt b/deploy/release-images.txt deleted file mode 100644 index 450dcde..0000000 --- a/deploy/release-images.txt +++ /dev/null @@ -1,11 +0,0 @@ -longhornio/csi-attacher:v2.2.1-lh2 -longhornio/csi-node-driver-registrar:v1.2.0-lh1 -longhornio/csi-provisioner:v1.6.0-lh2 -longhornio/csi-resizer:v0.5.1-lh2 -longhornio/csi-snapshotter:v2.1.1-lh2 -longhornio/backing-image-manager:v1_20210422 -longhornio/longhorn-engine:v1.1.2 -longhornio/longhorn-instance-manager:v1_20210621 -longhornio/longhorn-manager:v1.1.2 -longhornio/longhorn-share-manager:v1_20210914 -longhornio/longhorn-ui:v1.1.2