From 722175ffededb91598c01b0340799e00cae97cbd Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Wed, 20 Dec 2023 10:11:21 +0100
Subject: [PATCH] apps(sharkey): Fix config setup

---
 apps/sharkey/app/config-sealedsecret.yaml |  2 +-
 apps/sharkey/app/deploy.yaml              | 20 +++++++-------------
 apps/sharkey/app/sealedsecret.yaml        |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/apps/sharkey/app/config-sealedsecret.yaml b/apps/sharkey/app/config-sealedsecret.yaml
index 15ad75f..bf5d672 100644
--- a/apps/sharkey/app/config-sealedsecret.yaml
+++ b/apps/sharkey/app/config-sealedsecret.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: sharkey
 spec:
   encryptedData:
-    secret.yaml: AgAYJjYoxcBeqMdf+R5bb/fB7KTSDf/LchotQRJClzU5l9vCJFuJiGh7dhzT5ZLzHM+6gf1cEuI6vCXiHsNTAiTbkpjbKPhlUU3vMNpieuh8HBjTHzeCNJpLl1UIRxBOPZ9fgzp9ROSoaEjMBgSSc7zgTnhr4s7/FNTbCzeuHso6MiHNdtcC9yFeiwDb17Bm1r8Lko88fRWHqKAHeNoLnh1bo316C6H1fLvsQC/MWN+shXxpMnRIjjIAtIgW+8ayvAdYjs0TAhKgWRLD/mjku5toqoK+uOGypVjrkfrrKPtDgWD/VO8SFRLXoJfhen2PAU1dbmrrHBJy/RPJ3cOPTU4cVSeKtwLmj0a2YxjLOldv9zQ1SnRqkCSQUMQf+7/cArWhn632qsuhm/ECzbE7w11T3N9hlyhl8ZebSzSgW87B9Re7syiBh10Wno4uUuzETkQ6/59jrpfLFzdmptYd623RT72kzjg+uHYzw0fp6kzjd0yMi3bbt1c6JaW0y9WPkRQN4ONcIfi3XJ07uulLsj2x6R90a3zea+cCDJdDF24Bqr/MK9Ro5MooHmEMm6C06Lf5GUjirkoktUnosxsEywiYpOgwrfS0ib1OCCw1+qSoStyBW1EGI7tDVrY16R1I1XSjz1CJrl0Zq2ZFHtU8rlYTuIm5JnVq1/lkJZQsO1NP5RE6rhkOS2RqMIjyDNXPyyR4irdodQutkY2ToZb8qFo6NH9oMYtyXVERtes9TwwmjmQtwQdDMBhknMVutUlsHGzawepuucsOYhRyk3bqxhAgE+WXE+4c2fwu7/EIL+rtNSMqTwGvSTgYT63tZhsWC5/NqRtwBMpFhKXxqgN1r2mkperB
+    secret.yml: AgAiw2slTXLctPiu0A/Aa7DgHKq60MkzMHhBJtSyu5Jjz2uNf5IG3w8dolA4Fix56vZGTND2ZXeATq3qL9sidkonLCi1iQ6za5rOpMV4jUKQdkMcUvbXKy71RPe3SsBQ7ezpfAEHlulw2LDM93Tb+2DiFB/oi5S9BrHljqNmG2pfvFSiKoXXUi5M8DPoT8rfc+EnKdM2dIs6CmbsPI1c04YXkEjEqBaTW4rHRcDRoBH0GykuTHAa2raGEcIoYGJoeV7Ghd2ZExUtYolZibBBPvAbyVWAseYeghUBJEy/gdLFKicOXKQ7+uC1KAYCmIqQ9gL3o9Bd0sV0qeRS3G8A79XqEkvH8OrBMuseIfSkED1OnIS/Gm7vtJ+lRXwfPBn98eK0akAsDPA2aISznmBlFOjS0WTzTFECS0bkWpEDvPEpFsoL0suGHm0suTZFm5qdCLZOhmjHfWU2Vu1Yc4BBAH+D1a7BMHBQsH4IDuKGNqlSvJRGeB4lsMuecAonnWzc1wZi+K+NllRfqRfG87Tskw2VZmRSnFBcVEFPntF3otNG3IQQ3kc8HsotJkd1ta8n5ScxIHGUbSNCGtiRZ7zdttsU736wf53tgDSK8eZY2ogMDbRz+OZfFxHYqiBEgx2P04UaP/vpJzV2oBfESvA61xmER9+c6VDQzA3utv6FZge26/VfTBEQFwRsX5uZ4M9qoPPklml1cwVvHJVl1I/VATmR1rrK+dMAQGGszRlFDPYDWp1e53NzmcKcTN3cTmvTSbFcO3kQlhU49NQb3+r49X+BwKFULdY2zFOXdKGcBIAEn5oXRIkoHIOMvRrJxu6H9B2yE3tXLrUgFMQ6dZlL/8X4VU6o
   template:
     metadata:
       creationTimestamp: null
diff --git a/apps/sharkey/app/deploy.yaml b/apps/sharkey/app/deploy.yaml
index 11f2f2f..63dbaa8 100644
--- a/apps/sharkey/app/deploy.yaml
+++ b/apps/sharkey/app/deploy.yaml
@@ -26,14 +26,8 @@ spec:
         - name: config
           mountPath: "/config"
           readOnly: true
-        command: ['sh', '-c', 'mkdir -p /sharkey/.config; cp /config-secret/*.yml /sharkey/.config/; cp /configt/*.yml /sharkey/.config/;']
+        command: ['sh', '-c', 'cat /config/default.yml > /sharkey/.config/default.yml; cat /config-secret/secret.yml >> /sharkey/.config/default.yml;']
       containers:
-      - name: redis
-        image: redis
-        ports:
-          - containerPort: 6379
-            name: redis
-            protocol: TCP    
       - image: ghcr.io/transfem-org/sharkey:stable
         name: sharkey
         volumeMounts:
@@ -42,12 +36,12 @@ spec:
         - name: sharkey-config
           mountPath: "/sharkey/.config"
           readOnly: true
-        env:
-        - name: example
-          valueFrom:
-            secretKeyRef:
-              name: example-secret
-              key: example
+      - name: redis
+        image: redis
+        ports:
+          - containerPort: 6379
+            name: redis
+            protocol: TCP    
       volumes:
       - name: config-secret
         secret:
diff --git a/apps/sharkey/app/sealedsecret.yaml b/apps/sharkey/app/sealedsecret.yaml
index 40eb43e..be92bdf 100644
--- a/apps/sharkey/app/sealedsecret.yaml
+++ b/apps/sharkey/app/sealedsecret.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: sharkey
 spec:
   encryptedData:
-    create-user.sql: AgCLEUD8N2UkaLu/HCu0XG6cOXqdhy2TUGohMwknLVEli0U91Ez3U6XIME6EPxbD/+yfCId41M/fqE1TIDh9mFEYcv0nlgzjKeBjkAiDXPTTsavWhJk1zWqv7+/PRFM6mmHTJY3N5DxHh4YwTPcWXuQMxu1UpOgwgdZM+VvVL5SlMVmk7YaPzskyhny/IqV2iQkHw05Jgc6qeIm1GmvfsXUYDigIckyNKzmKrroKUZRMUo9b/gsFAdUR00+AUaUIXr332GZh/bUWPn80Y2BOEp0O9fu4WsrRRv/I3B5u0Z0MlNpWiADN3AEUu0lHwIHBtad69yCX30ryuFoj0jOUT3EXhn5/uSVRn0BI3mdxmgCkJwOEf74ZJvGP/OCPl9B3weg3z4YejDH8+5g3cLqGS1JBkcbppD9G8XQOsjnKHHNM22aareCUxy4b2Sh3vBf21tASq5DFXpj+uV8VZKVSFhX2a4m7NFyUj/1mKUNS9D0PxQrnOj7AoWlDnWw2+W6t/eA77QJqIrS2fxEKWsZZTgh/9v28S77VEASKhacVq+bmL2jU1vHZUfltG1YAAjE59yJaST0zjowY0PTQB0YyuluGA4PnbLYF4fHxr1jhN2J5hj3UvIriEeASJA/pB6CcmJ+yootg/fobfJLBzEXvHDhIhos+9icsJsr36NanQv9a6b20qm8AjPta9VJ6NcgCkFumjQUgb/U5MAIEVtPpM6GMTytZFyabwX8ATy7174CcQeL6eA+H9lzfIrQ4VOSES6c=
+    create-user.sql: AgCmaoN9q1UHvTPboibiMmjkE/6ya6wb8B1Kyx2jm7SQRgGB70OBGBeXLHRKU1bATIn+hHrnyQ/kmtnvnk6ngQUZ3rF28IUcYHrog4vSQRnbqdUCTKe0ZKIguvJXc238Lx5v8WANhcdd11MASAwRi/ZLL+H8FZ41rMr4GuL7l5YuBqwblos4kA67dLUs7Br8A9WEjmNbT9U7DjYvWisf4t0Q2sLAXvADu7sx+fGuIZMREUNHVfLGzbWdMMkMz3OcfetGx9zWlc//MmuXey6EKdtf/2ViRS1/TvEeiWTySs8caNJzOvpcRJk1Esi3A75Fn6ciV/MLjrh4KN1xYBYezgKgDi23ixdRJ1bI0AP2MwBG8i90u3kx4VtZI60eJjri45//3oqcEXyST2lmALSm/as42mOWH3iwPArOxK9ivTQPKMxBMgQ+XmEpf0hfaM3fVnN8gEHt9PIPG+jtsjdZ5RulVo+1nF3/9Lw77v481jV82/siI8b8H7tvdgPNKLXSCeTrA8N7BZHylcqRkW/RdUmDKCD6GbB9IwCXNCj5r309gju96ZQeuiSx/F0otfvi5EVNkz7N4d/9p9AF9ABTNv0zK5K7EbHugt/A/8Uz+Tqm5B1YjJoZI8sccmewICYxKYdl1Z5aUqo4kectUUNWNI7gPe1JLy5u2e3Fd/5cbgc7+ADg5VJ0LBKsdXU075NIn5g1WrioVCcfyVd3awQWGdRS2gyKa04qWxmX8Gzb478q3qKIGYo8ER2Ox2hHVp9efKc=
   template:
     metadata:
       creationTimestamp: null