From 9cc4cccd5bf7c4f5ca0a62e8075685ad08e8b0f4 Mon Sep 17 00:00:00 2001
From: Emilien Devos <121870973+edevosc2c@users.noreply.github.com>
Date: Thu, 14 Mar 2024 10:52:05 +0100
Subject: [PATCH] remove datadir before git clone

helps with https://github.com/georchestra/helm-georchestra/issues/81
---
 datahub/Chart.yaml                                              | 2 +-
 datahub/templates/_bootstrap-datahub-configuration.tpl          | 1 +
 metadata-editor/Chart.yaml                                      | 2 +-
 .../templates/_bootstrap-metadata-editor-configuration.tpl      | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/datahub/Chart.yaml b/datahub/Chart.yaml
index f4ef0d5..abec73f 100644
--- a/datahub/Chart.yaml
+++ b/datahub/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: datahub
 description: A Helm chart to deploy the datahub application
 type: application
-version: 0.4.3
+version: 0.5.4
 appVersion: "1.16.0"
 maintainers:
   - name: geOrchestra
diff --git a/datahub/templates/_bootstrap-datahub-configuration.tpl b/datahub/templates/_bootstrap-datahub-configuration.tpl
index 7b88776..3fd2bb5 100644
--- a/datahub/templates/_bootstrap-datahub-configuration.tpl
+++ b/datahub/templates/_bootstrap-datahub-configuration.tpl
@@ -9,6 +9,7 @@
     cp /ssh-secret/ssh-privatekey /root/.ssh/id_rsa ;
     chmod 0600 /root/.ssh/id_rsa ;
     {{- end }}
+    rm -Rf /etc/datahub
     git clone --depth 1 --single-branch {{ .Values.configuration.git.url }} -b {{ .Values.configuration.git.ref }} /etc/datahub ;
   {{- if .Values.configuration.git.ssh_secret }}
   env:
diff --git a/metadata-editor/Chart.yaml b/metadata-editor/Chart.yaml
index a456978..85897ae 100644
--- a/metadata-editor/Chart.yaml
+++ b/metadata-editor/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: metadata-editor
 description: A Helm chart to deploy the metadata-editor application
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "1.0.0"
 maintainers:
   - name: geOrchestra
diff --git a/metadata-editor/templates/_bootstrap-metadata-editor-configuration.tpl b/metadata-editor/templates/_bootstrap-metadata-editor-configuration.tpl
index ac17c1f..97ba8b3 100644
--- a/metadata-editor/templates/_bootstrap-metadata-editor-configuration.tpl
+++ b/metadata-editor/templates/_bootstrap-metadata-editor-configuration.tpl
@@ -9,6 +9,7 @@
     cp /ssh-secret/ssh-privatekey /root/.ssh/id_rsa ;
     chmod 0600 /root/.ssh/id_rsa ;
     {{- end }}
+    rm -Rf /etc/metadata-editor
     git clone --depth 1 --single-branch {{ .Values.configuration.git.url }} -b {{ .Values.configuration.git.ref }} /etc/metadata-editor ;
   {{- if .Values.configuration.git.ssh_secret }}
   env: