From 34e87c5fd7045448d0096a9b3384e419b5b5a693 Mon Sep 17 00:00:00 2001
From: Phan Le <phan.le@suse.com>
Date: Thu, 18 Nov 2021 00:29:10 -0800
Subject: [PATCH] Revert "Raise minimum Kubernetes version to v1.18 and bump
 CSI components's version"

This reverts commit dff9b7b73f57d5d775fcff74c7b8edd887c276d1.

Signed-off-by: Phan Le <phan.le@suse.com>
---
 chart/Chart.yaml                  |  2 +-
 chart/templates/clusterrole.yaml  |  2 +-
 chart/templates/storageclass.yaml |  3 ---
 chart/values.yaml                 | 11 +++++------
 deploy/longhorn-images.txt        | 10 +++++-----
 deploy/release-images.txt         | 11 +++++++++++
 examples/storageclass.yaml        |  1 -
 7 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 deploy/release-images.txt

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 3a4d1eb..5cefed9 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: longhorn
 version: 1.1.2
 appVersion: v1.1.2
-kubeVersion: ">=1.18.0-0"
+kubeVersion: ">=v1.16.0-r0"
 description: Longhorn is a distributed block storage system for Kubernetes.
 keywords:
 - longhorn
diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml
index 5adbadd..cd5aafb 100644
--- a/chart/templates/clusterrole.yaml
+++ b/chart/templates/clusterrole.yaml
@@ -29,7 +29,7 @@ rules:
   resources: ["priorityclasses"]
   verbs: ["watch", "list"]
 - apiGroups: ["storage.k8s.io"]
-  resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes", "csidrivers"]
+  resources: ["storageclasses", "volumeattachments", "csinodes", "csidrivers"]
   verbs: ["*"]
 - apiGroups: ["snapshot.storage.k8s.io"]
   resources: ["volumesnapshotclasses", "volumesnapshots", "volumesnapshotcontents", "volumesnapshotcontents/status"]
diff --git a/chart/templates/storageclass.yaml b/chart/templates/storageclass.yaml
index 311b927..dea6aaf 100644
--- a/chart/templates/storageclass.yaml
+++ b/chart/templates/storageclass.yaml
@@ -20,9 +20,6 @@ data:
       numberOfReplicas: "{{ .Values.persistence.defaultClassReplicaCount }}"
       staleReplicaTimeout: "30"
       fromBackup: ""
-      {{- if .Values.persistence.defaultFsType }}
-      fsType: "{{.Values.persistence.defaultFsType}}"
-      {{- end }}
       baseImage: ""
       {{- if .Values.persistence.recurringJobs.enable }}
       recurringJobs: '{{ .Values.persistence.recurringJobs.jobList }}'
diff --git a/chart/values.yaml b/chart/values.yaml
index c158484..fc6c63b 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -28,19 +28,19 @@ image:
   csi:
     attacher:
       repository: longhornio/csi-attacher
-      tag: v3.2.1
+      tag: v2.2.1-lh2
     provisioner:
       repository: longhornio/csi-provisioner
-      tag: v2.1.2
+      tag: v1.6.0-lh2
     nodeDriverRegistrar:
       repository: longhornio/csi-node-driver-registrar
-      tag: v2.3.0
+      tag: v1.2.0-lh1
     resizer:
       repository: longhornio/csi-resizer
-      tag: v1.2.0
+      tag: v0.5.1-lh2
     snapshotter:
       repository: longhornio/csi-snapshotter
-      tag: v3.0.3
+      tag: v2.1.1-lh2
   pullPolicy: IfNotPresent
 
 service:
@@ -53,7 +53,6 @@ service:
 
 persistence:
   defaultClass: true
-  defaultFsType: ext4
   defaultClassReplicaCount: 3
   reclaimPolicy: Delete
   recurringJobs:
diff --git a/deploy/longhorn-images.txt b/deploy/longhorn-images.txt
index ac03c10..35f8d3b 100644
--- a/deploy/longhorn-images.txt
+++ b/deploy/longhorn-images.txt
@@ -1,8 +1,8 @@
-longhornio/csi-attacher:v3.2.1
-longhornio/csi-node-driver-registrar:v2.3.0
-longhornio/csi-provisioner:v2.1.2
-longhornio/csi-resizer:v1.2.0
-longhornio/csi-snapshotter:v3.0.3
+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
diff --git a/deploy/release-images.txt b/deploy/release-images.txt
new file mode 100644
index 0000000..35f8d3b
--- /dev/null
+++ b/deploy/release-images.txt
@@ -0,0 +1,11 @@
+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_20210416
+longhornio/longhorn-ui:v1.1.2
diff --git a/examples/storageclass.yaml b/examples/storageclass.yaml
index 0acab73..96c06d9 100644
--- a/examples/storageclass.yaml
+++ b/examples/storageclass.yaml
@@ -17,7 +17,6 @@ data:
       numberOfReplicas: "2"
       staleReplicaTimeout: "2880"
       fromBackup: ""
-      fsType: "ext4"
     #  backingImage: "bi-test"
     #  backingImageURL: "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"
     #  diskSelector: "ssd,fast"