feat: add snapshot GA version

run snapshot GA version in external tests fixed script export
kubernetes-sigs · Jun 7, 2021 · 60ab66b · 60ab66b
1 parent 9240e8c
commit 60ab66b
Show file tree

Hide file tree

Showing 7 changed files with 639 additions and 4 deletions.
diff --git a/charts/latest/azurefile-csi-driver-v1.4.0.tgz b/charts/latest/azurefile-csi-driver-v1.4.0.tgz
diff --git a/charts/latest/azurefile-csi-driver/templates/crd-csi-snapshot-ga.yaml b/charts/latest/azurefile-csi-driver/templates/crd-csi-snapshot-ga.yaml
diff --git a/charts/latest/azurefile-csi-driver/templates/crd-csi-snapshot.yaml b/charts/latest/azurefile-csi-driver/templates/crd-csi-snapshot.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.snapshot.enabled -}}
+{{- if eq .Values.snapshot.apiVersion "beta" }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -500,3 +501,4 @@ status:
   conditions: []
   storedVersions: []
 {{- end -}}
+{{- end -}}
diff --git a/charts/latest/azurefile-csi-driver/values.yaml b/charts/latest/azurefile-csi-driver/values.yaml
@@ -51,6 +51,7 @@ node:
 
 snapshot:
   enabled: false
+  apiVersion: beta # available values: beta, ga
   image:
     csiSnapshotter:
       repository: mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter
@@ -72,7 +73,7 @@ linux:
   enabled: true
   kubelet: /var/lib/kubelet
   kubeconfig: ""
-  distro: debian
+  distro: debian # available values: debian, fedora
 
 windows:
   enabled: true

diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh
@@ -31,7 +31,7 @@ setup_e2e_binaries() {
         # enable fsGroupPolicy (only available from k8s 1.20)
         export EXTRA_HELM_OPTIONS="--set feature.enableFSGroupPolicy=true"
     fi
-    # install the blob csi driver
+    export EXTRA_HELM_OPTIONS="${EXTRA_HELM_OPTIONS} --set snapshot.image.csiSnapshotter.tag=v4.0.0 --set snapshot.image.csiSnapshotController.tag=v4.0.0 --set snapshot.apiVersion=ga"
     make e2e-bootstrap
     make create-metrics-svc
 }

diff --git a/test/external-e2e/testdriver-nfs.yaml b/test/external-e2e/testdriver-nfs.yaml
@@ -15,4 +15,4 @@ DriverInfo:
     controllerExpansion: true
     nodeExpansion: true
     volumeLimits: false
-    snapshotDataSource: false
+    snapshotDataSource: true
diff --git a/test/external-e2e/testdriver-smb.yaml b/test/external-e2e/testdriver-smb.yaml
@@ -15,4 +15,4 @@ DriverInfo:
     controllerExpansion: true
     nodeExpansion: true
     volumeLimits: false
-    snapshotDataSource: false
+    snapshotDataSource: true