From 4685b1bd359a912d79eb9e6a72036450b67bbc34 Mon Sep 17 00:00:00 2001
From: gaoshiyao <gaoshiyao@bd-apaas.com>
Date: Thu, 25 Apr 2019 11:39:43 +0800
Subject: [PATCH] update

---
 step.yaml                  | 13 ++++++++-----
 templates/statefulset.yaml | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/step.yaml b/step.yaml
index 2660f7d..07312cb 100644
--- a/step.yaml
+++ b/step.yaml
@@ -9,9 +9,12 @@ configInfo:
     value: ["latest"]
   - name: storageSpec.volumeClaimTemplate.spec.storageClassName
     text: 存储类
-    type: radio
+    type: storage
     value: ["rook-ceph-block"]
-  - name: storageSpec.volumeClaimTemplate.spec.resources.requests.storage
-    text: 存储容量
-    type: text
-    value: "5Gi"
\ No newline at end of file
+    storage: "4Gi"
+    hostpath: "/data/path"
+  - name: storageSpec.volumeClaimTemplate.spec.resources
+    text: 资源限制
+    type: resource
+    memory: "5Gi"
+    cpu: "1000m"
\ No newline at end of file
diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml
index 5f2ff67..8d788a3 100644
--- a/templates/statefulset.yaml
+++ b/templates/statefulset.yaml
@@ -58,8 +58,14 @@ spec:
       {{- if .Values.storageSpec.hostPath }}
         - name: data
           hostPath:
-{{ toYaml $.Values.storageSpec.hostPath | indent 10 }}           
-      {{- else if .Values.storageSpec.volumeClaimTemplate }}
+              path: /data/{{ .Release.Namespace }}/{{ .Release.Name }}/oracle11g
+      {{- else if .Values.storageSpec.emptyDir }}
+        - name: data
+          emptyDir: {}
+      {{- end }}
+  {{- if .Values.storageSpec.hostPath }}
+  {{- else if .Values.storageSpec.emptyDir }}
+  {{- else if .Values.storageSpec.volumeClaimTemplate }}
   volumeClaimTemplates:
   - metadata:
       name: "data"
@@ -68,7 +74,4 @@ spec:
         app: {{ .Release.Name }}
     spec:
 {{ toYaml $.Values.storageSpec.volumeClaimTemplate.spec | indent 6 }}
-      {{- else }}
-        - name: data
-          emptyDir: {}
       {{- end }}
\ No newline at end of file
-- 
2.26.0