From eff26e8c3eb89defa66c6f872380437c93e3f6b0 Mon Sep 17 00:00:00 2001
From: Mehran Kholdi <semekh@hamravesh.com>
Date: Tue, 29 Jun 2021 16:51:28 +0430
Subject: [PATCH] Drop support for k8s <1.19

So that we can:
* Rely on existence of newer features
* Update external components' images
---
 .ci/e2e-test/setup.sh                                        | 4 ++--
 README.md                                                    | 4 ++++
 deploy/charts/rawfile-csi/templates/00-driver.yaml           | 5 ++---
 .../charts/rawfile-csi/templates/01-controller-plugin.yaml   | 4 ++--
 deploy/charts/rawfile-csi/templates/01-node-plugin.yaml      | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.ci/e2e-test/setup.sh b/.ci/e2e-test/setup.sh
index 397e222..7c09747 100755
--- a/.ci/e2e-test/setup.sh
+++ b/.ci/e2e-test/setup.sh
@@ -2,8 +2,8 @@
 set -ex
 source .ci/common
 
-K8S_VERSION=1.18.20
-MINIKUBE_VERSION=1.18.1
+K8S_VERSION=1.19.12
+MINIKUBE_VERSION=1.19.0
 curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
 sudo apt update && sudo apt install -y conntrack
 curl -Lo minikube https://storage.googleapis.com/minikube/releases/v${MINIKUBE_VERSION}/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
diff --git a/README.md b/README.md
index 1e71d13..352cea6 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,10 @@ RawFilePV
 
 Kubernetes LocalPVs on Steroids
 
+Prerequisite
+---
+- Kubernetes: 1.19+
+
 Install
 ---
 `helm install -n kube-system rawfile-csi ./deploy/charts/rawfile-csi/`
diff --git a/deploy/charts/rawfile-csi/templates/00-driver.yaml b/deploy/charts/rawfile-csi/templates/00-driver.yaml
index 880c8ca..7c6bdc9 100644
--- a/deploy/charts/rawfile-csi/templates/00-driver.yaml
+++ b/deploy/charts/rawfile-csi/templates/00-driver.yaml
@@ -1,11 +1,10 @@
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: {{ .Values.provisionerName }}
 spec:
   attachRequired: false
   podInfoOnMount: true
-{{- if semverCompare ">=1.16" .Capabilities.KubeVersion.Version }}
+  fsGroupPolicy: File
   volumeLifecycleModes:
     - Persistent
-{{- end }}
diff --git a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
index 336c38e..f55912b 100644
--- a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
+++ b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
@@ -61,7 +61,7 @@ spec:
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
         - name: external-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.0
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -74,7 +74,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: external-resizer
-          image: quay.io/k8scsi/csi-resizer:v1.0.0
+          image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
index e50e40c..b39ce76 100644
--- a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
+++ b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
@@ -91,7 +91,7 @@ spec:
           resources:
             {{- toYaml .Values.node.resources | nindent 12 }}
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)