From 89dce7c92c0345210844d09278cbfc6b5c9099ce Mon Sep 17 00:00:00 2001
From: Jian Zeng <zengjian@caicloud.io>
Date: Mon, 25 Jan 2021 11:36:05 +0800
Subject: [PATCH] chore(chart): update storageClass & version

---
 manifests/cyclone/Chart.yaml                | 4 ++--
 manifests/cyclone/templates/controller.yaml | 2 +-
 manifests/cyclone/templates/server.yaml     | 9 ++++-----
 manifests/cyclone/values.yaml               | 3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/cyclone/Chart.yaml b/manifests/cyclone/Chart.yaml
index fd69d76e9..a516594f8 100644
--- a/manifests/cyclone/Chart.yaml
+++ b/manifests/cyclone/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: A Helm chart for Cyclone
 name: cyclone
-version: v1.2.0-rc
-appVersion: v1.2.0-rc
+version: v1.2.0
+appVersion: v1.2.0
 keywords:
   - cicd
   - workflow
diff --git a/manifests/cyclone/templates/controller.yaml b/manifests/cyclone/templates/controller.yaml
index c15d179c5..22e9fa8b5 100644
--- a/manifests/cyclone/templates/controller.yaml
+++ b/manifests/cyclone/templates/controller.yaml
@@ -48,7 +48,7 @@ data:
         "workflow_run": 1,
         "pod": 1
       },
-      "pvc": "cyclone-server-cyclone-data",
+      "pvc": {{ .Values.pvcName | quote }},
       "cyclone_server_addr": "{{ .Values.platformConfig.controlClusterVIP }}:{{ .Values.server.clusterPort }}",
       "notification_url": "http://{{ .Values.platformConfig.controlClusterVIP }}:{{ .Values.server.clusterPort }}/apis/v1alpha1/notifications"
     }
diff --git a/manifests/cyclone/templates/server.yaml b/manifests/cyclone/templates/server.yaml
index 939a87f98..8cf5d7489 100644
--- a/manifests/cyclone/templates/server.yaml
+++ b/manifests/cyclone/templates/server.yaml
@@ -143,9 +143,8 @@ spec:
           path: /etc/localtime
           type: File
       - name: cyclone-data
-        emptyDir: {}
-        #persistentVolumeClaim:
-        #  claimName: cyclone-server-cyclone-data
+        persistentVolumeClaim:
+          claimName: {{ .Values.pvcName }}
 
 ---
 kind: Service
@@ -183,7 +182,7 @@ metadata:
     helm.sh/chart: {{ include "cyclone.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: cyclone-server-cyclone-data
+  name: {{ .Values.pvcName }}
   namespace: {{ .Release.Namespace }}
 spec:
   accessModes:
@@ -193,5 +192,5 @@ spec:
       storage: 10Gi
     requests:
       storage: 10Gi
-  storageClassName: platform-storageclass
+  storageClassName: {{ .Values.server.pvc.storageClass }}
   volumeMode: Filesystem
diff --git a/manifests/cyclone/values.yaml b/manifests/cyclone/values.yaml
index 61021fda0..15d08400c 100644
--- a/manifests/cyclone/values.yaml
+++ b/manifests/cyclone/values.yaml
@@ -5,6 +5,7 @@ platformConfig:
   controlClusterVIP: 1.2.3.4
 
 serviceAccount: default
+pvcName: cyclone-server-cyclone-data
 
 # Cyclone workflow engine variables
 engine:
@@ -59,7 +60,7 @@ server:
   openControlCluster: false
   pvc:
     # Default storageClass which Cyclone will use to create PVC.
-    storageClass: "heketi-storageclass"
+    storageClass: "platform-storageclass"
     size: 10Gi
   workerNamespaceQuota:
     requests.cpu: "1"