remove datadir before git clone

helps with georchestra/helm-georchestra#81
camptocamp · Mar 14, 2024 · 418b1a8 · 418b1a8
1 parent 992a658
commit 418b1a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/cadastrapp/Chart.yaml b/cadastrapp/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for deploying geOrchestra's cadastrapp
 
 type: application
 
-version: 0.2.1
+version: 0.2.2
 
 # Last version released on https://github.com/georchestra/cadastrapp is 2.0
 appVersion: "2.0.0"
diff --git a/cadastrapp/templates/cadastrapp-depl.yaml b/cadastrapp/templates/cadastrapp-depl.yaml
@@ -31,6 +31,7 @@ spec:
           cp /ssh-secret/ssh-privatekey /root/.ssh/id_rsa ;
           chmod 0600 /root/.ssh/id_rsa ;
         {{- end }}
+          rm -Rf /etc/georchestra
           git clone {{ .Values.cadastrapp.datadir.git.url }} -b {{ .Values.cadastrapp.datadir.git.ref }} /etc/georchestra
         env:
         {{- if .Values.cadastrapp.datadir.git.ssh_secret }}

diff --git a/geoserver-lb/Chart.yaml b/geoserver-lb/Chart.yaml
@@ -2,5 +2,5 @@ name: geoserver-lb
 apiVersion: v2
 description: A Helm chart for deploying geoserver loadbalanced
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: "22.0.4"
diff --git a/geoserver-lb/templates/geoserver-deploy.yaml b/geoserver-lb/templates/geoserver-deploy.yaml
@@ -68,6 +68,7 @@ spec:
           - mkdir -p /root/.ssh ;
             cp /ssh-secret/ssh-privatekey /root/.ssh/id_rsa ;
             chmod 0600 /root/.ssh/id_rsa ;
+            rm -Rf /etc/georchestra
             if [ ! -f /etc/georchestra/default.properties ] ; then
               git clone {{ .Values.geoserver.git.repository_url }} -b {{ .Values.geoserver.git.branch }} /etc/georchestra ;
             fi ;