From e9d451c91c8ea664df046fb14eeea3da9f70ed22 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 31 Aug 2021 17:33:54 +0200
Subject: [PATCH] fix: remove timecapsule module, adjust storage

---
 charts/kubezero/Chart.yaml                 |  2 +-
 charts/kubezero/templates/argoless.yaml    |  2 +-
 charts/kubezero/templates/storage.yaml     | 11 ++++++++---
 charts/kubezero/templates/timecapsule.yaml |  8 --------
 charts/kubezero/values.yaml                |  3 ---
 5 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 charts/kubezero/templates/timecapsule.yaml

diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 8685e93a..58e61662 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart
 type: application
-version: 1.20.8-5
+version: 1.20.8-6
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero/templates/argoless.yaml b/charts/kubezero/templates/argoless.yaml
index 1ed9084d..d7c95202 100644
--- a/charts/kubezero/templates/argoless.yaml
+++ b/charts/kubezero/templates/argoless.yaml
@@ -1,7 +1,7 @@
 {{- if and ( not .Values.argocdAppName ) ( not .Values.installKubeZero ) }}
 # if no ArgoCD is used, only render the global values.yaml for all kubezero modules
 
-{{- $artifacts := list "calico" "cert-manager" "kiam" "aws-ebs-csi-driver" "aws-efs-csi-driver" "istio" "istio-ingress" "metrics" "logging" "argocd" "timecapsule" "storage" }}
+{{- $artifacts := list "calico" "cert-manager" "kiam" "aws-ebs-csi-driver" "aws-efs-csi-driver" "istio" "istio-ingress" "metrics" "logging" "argocd" "storage" }}
 
 {{- range $artifacts }}
 {{- if index $.Values . }}
diff --git a/charts/kubezero/templates/storage.yaml b/charts/kubezero/templates/storage.yaml
index d601a082..9e65f991 100644
--- a/charts/kubezero/templates/storage.yaml
+++ b/charts/kubezero/templates/storage.yaml
@@ -1,8 +1,13 @@
 {{- define "storage-values" }}
 
-{{- with index .Values "storage" "storageClass" }}
-storageClass:
-  {{- . | toYaml | nindent 2 }}
+{{- with index .Values "storage" "lvm-localpv" }}
+lvm-localpv:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+
+{{- with .Values.storage.gemini }}
+gemini:
+  {{- toYaml . | nindent 2 }}
 {{- end }}
 
 {{- end }}
diff --git a/charts/kubezero/templates/timecapsule.yaml b/charts/kubezero/templates/timecapsule.yaml
deleted file mode 100644
index 61e8994b..00000000
--- a/charts/kubezero/templates/timecapsule.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- define "timecapsule-values" }}
-{{- end }}
-
-
-{{- define "timecapsule-argo" }}
-{{- end }}
-
-{{ include "kubezero-app.app" . }}
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index 5e8f3c6b..e60791a6 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -26,9 +26,6 @@ storage:
   enabled: false
   crds: true
 
-timecapsule:
-  enabled: false
-
 aws-ebs-csi-driver:
   enabled: false
   crds: true