From a75e56947a77fc1d7297671fc7be97183c5713b8 Mon Sep 17 00:00:00 2001
From: alice <alice@stacktonic.com.au>
Date: Mon, 26 Jun 2023 15:47:44 +0000
Subject: [PATCH 1/2] Fix Gitea Deployment fully

---
 .gitea/workflows/release-version.yml | 14 ++++----------
 Makefile                             |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/release-version.yml b/.gitea/workflows/release-version.yml
index 0a54923..25ece65 100644
--- a/.gitea/workflows/release-version.yml
+++ b/.gitea/workflows/release-version.yml
@@ -13,7 +13,7 @@ jobs:
       - name: install tools
         run: |
           apt update -y
-          apt install -y curl
+          apt install -y curl lftp
           curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null
           echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list
           apt update -y
@@ -41,13 +41,7 @@ jobs:
           for filename in ./_build/*.tgz; do
             helm cm-push $filename cooopsspace
           done
-          
+
       - name: Deploy to FTP Server
-        uses: https://github.com/SamKirkland/FTP-Deploy-Action@v4.3.4
-        with:
-          server: ${{ secrets.ftp_host }}
-          username: ${{ secrets.ftp_user }}
-          server-dir: ./
-          local-dir: "./_build/"
-          protocol: ftps
-          password: ${{ secrets.ftp_password }}
+        run: |
+          lftp ${{ secrets.ftp_host }} -u ${{ secrets.ftp_user }},${{ secrets.ftp_password }} -e "set ftp:ssl-protect-data true; set ftp:ssl-force true; set ssl:verify-certificate true; mirror --overwrite --reverse --continue --dereference -x ^\.git/$ ./_build/ ./; quit"  
diff --git a/Makefile b/Makefile
index 0e74820..e9a2d09 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ romm: configure romm_ci
 	helm package charts/stable/romm/ -d _build/
 
 index:
-	curl -L -o _build/index.yaml https://charts.coo-ops.space/index.yaml
+	curl -L -o index.yaml https://charts.coo-ops.space/index.yaml
 	helm repo index _build/ --url https://charts.coo-ops.space --merge index.yaml
 
 ci: homebox_ci romm_ci
-- 
2.45.2


From 103b1d3145835093b1f6d97436a687330743cbc5 Mon Sep 17 00:00:00 2001
From: alice <alice@stacktonic.com.au>
Date: Mon, 26 Jun 2023 15:49:57 +0000
Subject: [PATCH 2/2] v0.1.1 Romm - Fix Service

---
 charts/stable/romm/Chart.yaml             | 2 +-
 charts/stable/romm/templates/service.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/stable/romm/Chart.yaml b/charts/stable/romm/Chart.yaml
index fdded60..0676452 100644
--- a/charts/stable/romm/Chart.yaml
+++ b/charts/stable/romm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: romm
 # This is the chart version.
-version: 0.1.0
+version: 0.1.1
 # A SemVer range of compatible Kubernetes versions (optional)
 # kubeVersion: ">=1.16.0-0"
 # What is this Application?
diff --git a/charts/stable/romm/templates/service.yaml b/charts/stable/romm/templates/service.yaml
index 7d28219..0825a1e 100644
--- a/charts/stable/romm/templates/service.yaml
+++ b/charts/stable/romm/templates/service.yaml
@@ -4,9 +4,9 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Values.namespace }}
   labels:
-    app: {{ .Release.Name }}
+    {{- include "romm.labels" . | nindent 4 }}
 spec:
   ports:
     - port: 80
   selector:
-    app: {{ .Release.Name }}
+    {{- include "romm.selectorLabels" . | nindent 4 }}
\ No newline at end of file
-- 
2.45.2