From 7639b7f7582e322b4689ac96a39796112a2cb917 Mon Sep 17 00:00:00 2001 From: SeanOMik <seanomik@gmail.com> Date: Sat, 15 Mar 2025 14:51:27 -0400 Subject: [PATCH] fix(seafile): fix configuration for v12 --- .../default/seafile/app/conf-env.sops.yaml | 70 ++++++++++++++++++ .../default/seafile/app/env-secret.sops.yaml | 71 ------------------- .../default/seafile/app/helm-release.yaml | 15 ++-- .../default/seafile/app/kustomization.yaml | 2 +- 4 files changed, 78 insertions(+), 80 deletions(-) create mode 100644 kubernetes/main/apps/default/seafile/app/conf-env.sops.yaml delete mode 100644 kubernetes/main/apps/default/seafile/app/env-secret.sops.yaml diff --git a/kubernetes/main/apps/default/seafile/app/conf-env.sops.yaml b/kubernetes/main/apps/default/seafile/app/conf-env.sops.yaml new file mode 100644 index 00000000..32dd2e49 --- /dev/null +++ b/kubernetes/main/apps/default/seafile/app/conf-env.sops.yaml @@ -0,0 +1,70 @@ +apiVersion: v1 +kind: Secret +metadata: + name: seafile-envfile +stringData: + .env: ENC[AES256_GCM,data:DlsyKwPJ3qQkMFIq377k5M8jMkrF4KyL4BHV72xbSMneKzR4lMinoR9apmLGvlpiH/tOpDlHyAUo3SuLY3VTyPsImWFNv21hyFkp7dEPOTWfTTPUSSLxpKENHnhb4twrqSAEtf1HBRnGqLUHyXxxMXdiyz2mkhDe4COl5SYtSFQh0lCevMp1SJpOLik6WroHwzDi4fDOI9Y/jzoeleRKxP6G5vmAIvEz7LWsra/zPHJQY1LttgNmm7tMzxGR3oy5hRJejEGCC4NN3zEMLJdGGXxqtm2E4D7+lqJfF4Mi84hZucqWKQ6ijac73lm5WK98DZlVZbOMBb7wGu92PBLTajScgI03Z8/eUS0DWNTQ4/JTMvDGnolwum8wzX0u5IMnPjlfkkbthgusfX67ytEEn1RvZi60BwJ6RKtv4dkqraPUO6oX35rhARxtFTYM9l4fA6UxtWgm3W1r35IWSEUs95eC1thIrFKo71G7NfZmQf8fgfa9OFZI0SHlSCD4KQ6dcT6hbqfiy3t9s3hFEJLX1uKUW14DT8DinbvjbJqzr93KFrnvwiSfJZzdHiWI71/a75RYnZS3RWBwRwMd3cYAPhjwJRYQkHx2wfdJpyRMkcDnM9LwStyBIf0UsvKsEKqNR1YTn+EPcMM3WEVHvPPF2/k9aem6hJ1ZMEqf3adkTw==,iv:G//dKOuKzrxKGC9krPYKqT2nhrAUttzpJhCBzZ7yK08=,tag:KWxIrT5NxidQgljWSyUNMA==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2025-03-15T18:50:51Z" + mac: ENC[AES256_GCM,data:q2zDRVHr77ped7wkLeyYGFopVzjQIVYKUZRRPLHy6aYOaUKr2hUe83RBqnucSBjJZ8jpywOJ6t31nvamCH9TW2h84EDOgbqXzS83Yi2dEi9GsZ0lX7WjGvsRSyDvqe942v3343kSwnTzkoOvlzOSDALWlOCrS2OeVpnqEceBfi4=,iv:obx6gO9YA/yWS9S3/h3Jb7WTBlCBZLmyofJjMVrdUMg=,tag:FRcg1z+F2/zm0OWTj8Pseg==,type:str] + pgp: + - created_at: "2025-03-15T18:50:51Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQIMAyqlIeyoxYovAQ/8C3IXPbrRmDHKyUoQBoCNy12wx1MNl+eJGjg4Deul7PaN + GoqqCwKLcaTsL9nj0MnWSlQdyC1JzMQ/lcGav44ve3gRCTbjvyVLPhEUR1iW/lbs + KZpCQ9JWAYAGvebfZsPbVEWteu2fotjI8SCeHrMElcrEIB4qmZ4Hn9xInXGejfIp + r41KuKhnMzfmkMQMzOSByg9WXmnMMkS0onTSKckw+qe7JVffb5+BhTb0L7amzON9 + OhGlM2i3CNJd0gcQtgeEadlIa2TOB94mroY5gf0KvxDUix5r0HMMChMrUKj09KNg + CiGFeqTv2gO2JKHsvZKQJ2jCjTeoS9WIdvaFGlvPd0O1cxBBWDhknhSRpUSln3Vp + rwx1jfwOqiZSB8jibfAi5POWa7kL3+nLfEFJ5/JoLqXcFZXgk8+UvD8nM++udMYh + KNArMAoBHawmcmrbF9Vgw6WU8LABzAWIFFjcJ61m0LRyxSLwP+q/CKh/UmX6rDD/ + aQeFmTfPqlsqutUgYCsLiKVRvPGGBrx6duhLAUNsQtMf40Yc2rmKbI9xMakMk8S/ + iV7tfq8W7LwfzV43zI/jr/K9u9c4lFc4OoEFtHWIZ3XmhYkxJW0sfaZDPU3hA7Uw + j3PidXHXKkxtsWEl86TSbpgSpcGaGSGPIXAwpF+bocr2zrufk8zPpBv0uF5LO++F + AgwDXjg0p2IN1X8BD/9K7j8dtCakHF9jS+N6EYPmCqvwMV+bXXl9kCN5qSxtuA8z + Cu2xSZZOMrMl2JY2xTesnHoywdo8qpX0itll2d59zixSNQzlPkLFgIiH8PQsjUrG + PYQgR4G1oOvvQHjCJWaY7uQx0qvmc2ZjaP97eaxlpBCCliE7pDJ/ZqHw3xATMzXb + 7JloRQ/J4g65/0GWiLHeBgbbKyHL0GtSwc5GOAwXrurlAFN+NXTBOKdGTjZe+rh4 + EO7IcblD5JQyCz3323gqvwK0e2ozN6sSLtL9j5Kt/zDVu03ZxAM/MhHhPzIm5Cax + nV7U5+4YQ2dAi53cQpJa3OgUt7gbRs3jyuEIUB9/qAcLKJGQ2I3HZhbIbiHpfwIu + BJVJt85KcEYvEEYkrWFoXovaI1l2SxeH45A2urXlCXLjXFo7xeTr/bnC1P1VXVfo + aBLEZEBoAX7HwjzMkrG+lEFN8YpSKsoj6CBUmPaL0PiTi2I2jI7O3OghREGnw3fZ + 0oyVj8LDvMuY/c+zXQHOOFqR/qWnTdD9A7OZutq5ghh7sSZsyPLlxK4mviuydNYb + Q0MzR9PJYo5+qNjT0GFTCtbGD6WnQ5OLFeKu+YsGCj35rdZB5o5km1ADgjqAQI5B + +rfThl+gEo9tQjQbYKvgEAWQrr/AVvAIhbcwOFj1RBq5Ucgj393Lt4zafTdv/tRo + AQkCEPAUdVe2ikv7tERROiF11EyT1rkVw7x+J3TkXiDuKM25PipIOZ6MEtLVIgJk + Z4WCzVN15tMrImvgDRdn7zbsR4lTWyWyNWTuAetySjUCfB2KcqyvRUAkmsECQeW1 + zPvaR4TASEo= + =eTqx + -----END PGP MESSAGE----- + fp: BD1AAF9D8170F4BEE437365FF6F0933799CFEBCD + - created_at: "2025-03-15T18:50:51Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQIMAy5t8IMoPu4VARAArcP1LgpzM6xSGN8qGr3NBuPHdvl/OUB9sVNahfwN4BAT + UxwgOL09g8MRdaa8PA7Vxv8zeJp4GR0hnLlb8KEl7czuM6/IfPsLgTyyXipl9ZXX + VaWZ/yO5q6b9/drI1HMhS+X2zzi6OoRuVpEjDXyYevP+P4Qv0M17l9ugdkLaPeeV + nteKMNTpqCah6zh1qcFQQt5ZTvFMviX0hxK3sQdbtKjgA/R36LWD5XO9GwQdZdAO + Ydun/4cDaKL0upAJDLwxBp5gHSgmhTUV/Xbg2OBegP7j5jyvfRCfNugeUScI4lqJ + MiHOLrxU4H9JKFvforh7re2fpkpSHJ1Qa3uEUyMXAj7KpiYDtD5Ecc/J1rip6xER + e6MdiCykkqNYLrRAh3c4h1rXAB5/LD3C60wNTBpMn4fLEdq5qq1Y0kiZHd6ueE4/ + gb8h4oMn6idfRWvvGZ7+B/U2hXUm3vv3JmXxerRTLnQo4suNCck81wNiZRsyxwnB + 9ahSfZaiqP4tW7AqpkQ3Wmi2GDwN1x/12tC+Ia13viC9QWLcNE2GNpeYTomudAyc + Q5OnSt0l8FE+sXQFXS/5iSNsxRrBi9MXtrb3Y0aMNbnG31BGsM33V1Y1pGYgM8jB + dOwTsxJYe3i/pDwisFzPkkZUfD9QvxFiRkWVE5k3+8U3os1P6uziYjs25+mM2AzU + aAEJAhAI8zjZW8pZ5SZIsgHYsmqaxY/crjJFVGBP0BPeaVK58JpcOZlwG8zcVqG1 + 7oo9DTMFhR4E1QnfT20hJxeBWy7raIA6DeY0WwbZ+kr3BEHipAUvVuEySqCeMORf + JJrqkEqlLjJc + =0PA/ + -----END PGP MESSAGE----- + fp: 687802D4DFD8AA82EA55666CF7DADAC782D7663D + encrypted_regex: ^(data|stringData)$ + version: 3.9.4 diff --git a/kubernetes/main/apps/default/seafile/app/env-secret.sops.yaml b/kubernetes/main/apps/default/seafile/app/env-secret.sops.yaml deleted file mode 100644 index c4bccf97..00000000 --- a/kubernetes/main/apps/default/seafile/app/env-secret.sops.yaml +++ /dev/null @@ -1,71 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: seafile-env -stringData: - DB_ROOT_PASSWD: ENC[AES256_GCM,data:c61w0LxJZWosVQJ00OHo3c/yAlOifsKSkCyymXNRaiM=,iv:rkJEodHcYaTzHDnpZEIYfeJvwnDvr91Oz2ILhvWQnIs=,tag:yP4N+gzQgAe8Uv11tf742g==,type:str] - SEAFILE_ADMIN_PASSWORD: ENC[AES256_GCM,data:n+EchmGEQVPdsWw=,iv:eX39MPzFgQ71WuMpdhfKB2p8qCoqsviihmeO+1Tk9C8=,tag:bv45s+Lk6MnMFOMswZEw4Q==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2025-03-10T22:15:21Z" - mac: ENC[AES256_GCM,data:GoD9bsMUc1UCaOKhS17Vzwb6kZcfGyHuwy6FM8uZuWx/ZJ0mUNOs9Q2y72jjaAL3DlWtiyP6/yUuQpHbSCVFfbcHs8QbckBwybkO8hhEOH+/1IUAdedFlkzIYifZa9p/GDkO5vGxBkCosPkVDowDjaT3xK+dH74dkZ0Y6OyRPx8=,iv:MQTp3sFod5rrq6Cy/oXdH8OjE6fhUSjB15LbFNIOL7Q=,tag:rEsBalAsYbK0P3WfbOE2fQ==,type:str] - pgp: - - created_at: "2025-03-10T22:15:21Z" - enc: |- - -----BEGIN PGP MESSAGE----- - - hQIMAyqlIeyoxYovAQ//doR7i38xedVqtt8UXIFyhkVNcTAky2AnM9mBJdsUnvZq - Roj3V10APfUPl1xchWecELl6YjBnxKaVWHIglkEVY/2+/8ORmY+H7n9cdeMMYZ+i - sa0rJujCodY9i15Teqj1bDGwX851qLiQ9yuONPlASgqrLV6bEFU4+Ufg4pp7Zrym - aXGmpgB7auqh2OVUkUIwy7bj4Gy+k8t1Q0hHTz05iUuLN/1FOw0RD7Tp7RS6qC/4 - 8d8NwdMB2ANvre8Ld0pGH8eAn7qxJBdYLIUel/SPZ9xwbeZ0JCOIuT1iYlTCmBP2 - pfLnTVsu7980ZUIdxe1J2LKIsXOxhcHbqq4iSaTj06uWHvf2OAGpvk1oKqS6Tczu - Wzvnzm87mzQJCRa1LdF43ds93Bxgl1yNqBF/Wwa/M+8Y4DcijUfCI9+OBpgCy1JJ - uLbaSqGgKnVirkm1xZahL+jxHZ82wjpys0Ze5hJpnHoibPpAA4nVUHlpF66+2G6w - iSck+X25/dzyaDrhpO8B9bjFFgvr9u0dMqqbJJbDpWeeC046C9pg+7isFkwscmMA - 8z7AFDShH13VXEUhdNWZN4IF3+2d5f4ShG0px0wdE9S8i6Rsp+iGmTR/FcUUBjTz - IR8R8sjMaY34+1QcIXwwTdTmMtAPCaGOBV6z0eEJygneKOdpvnQmcn+TFhldfcGF - AgwDXjg0p2IN1X8BEACeWqoLehxuLDfKR3qmvd9LkowYztAlCgCKwcNliT1v0Cwp - 22sjqGYCpH04/y4mELoThkkofCIYYS9FSGLbQutKknpV4FpKOO1nOzowDt6/3g78 - 1UquSxe2nkRSFkmFNBWKR32DAIQ+QrsBITL+n0bbC7QpxeKWqarohhl/giW9eUuw - L5Uak2bDvTu4OcSbAnBjvNx2JRcLfQMgIqDcIH7b7MinyA16guNgECrmePS3ab+z - lpmf2T2A867snAiQ9bn0q0xZdELqGd0XcgJgBrF5ylBQ1FYT8qjRJPhaIZA0ZDES - C3ktNdOy/ZMf+oNFBGmY9TbkqnkRAjSCyuuhPFnrnj7mLQMOoq3SDcB20HdzHqWT - jdcdkslS8mkkGDQEWCS7utvru7Z39eTx6U54Q/kmDKKmiKXOgAwAqOlH3rMhBIMO - z+MIrT7DbNPps5B3d9r3ewDD1HpwrJg/LV1Y+aITijgeg7g2bFDsvkC7vkzsuAZ/ - W5cv+BRle3zR3lOu194a6mBuvZaU+RfQxLr8+sK+fTroeWf743747hCh1aWzkRQT - VS6My3V4wBl19b5362HWAiWAha53qwoE6TKCqhhpkgBqCyR+o2U0G42m2yeAf0Ky - ZAyvitrFzWFDLgmyCFJEGpWkQrN/HqGK7h+t3dA3wuGJDyT1sXJ16jAkzS/N7dRo - AQkCEKWwvaO8FLzVTFBc2pQZmtwTiSVgMmd9d8EY355Xo+mEg8J/qrrMlPhh4Tbv - ytSYqGIn2kX8pd8caYNRjY9bHhOAwHjBOg/5raC0giluaA4+r0TJya/HKxSya/Ac - ns4DDNVHEJg= - =UCDj - -----END PGP MESSAGE----- - fp: BD1AAF9D8170F4BEE437365FF6F0933799CFEBCD - - created_at: "2025-03-10T22:15:21Z" - enc: |- - -----BEGIN PGP MESSAGE----- - - hQIMAy5t8IMoPu4VAQ/9F4nt9UrOGsNw5eY2cvhwfTX21+4cxmKKWaC/XErSzQFe - XjIfsiiCnpZLCMCazSid0WHKvw5gt033JMEBfvoq/91W0qso/9TAmaSM7sGoy1/o - jd0QDq+gF/wCLdQBi2N+FBPzLN10x03cYJEkGeEkCBL4k/X/SJ+aIY4umfwP/0wr - BjMU3QSFuiMrJbu/dA2RyHBHFchHUGFlpF2jbFK+sN3YFXcAUEzdL8SCJ3YNiVgo - /t/Y/lkKk/w3I4R6zg59QJPRcERML2hmeVFVLHJaSsRJzWrEEBEkUrvdLwRUqaAr - Z6/b3v4iu8/yQF94wY3biDg2YKtg4EnTGD11W4+dPWZ5AX2ukGI3CrfdvfNLuUm7 - iWCis7YhO/KYQkx8vX/RVHAQXX1J+7mG89LNLsGKZyrJrCyHG2V4iD+WnllMljF0 - du9zAckTEs3aRQ9VRP2e4Bs22qSOVqwMii4MD2cwwyhse/XpkMzfgiZC9h3lOIW0 - x2dXwG7mr3GvRYfnxR/P7Ow9YEERX3W6tZ3BY0KPq8bMZB8gPXfXlrZ9PK4H9aLt - Sd1bFX0iFguOfvR+rIY/P1rX6Twja+Y/pyvREqzNQ2PR0ZflLfyHmmAlD72XFLU6 - bdrMMTuzlIgEIrE9tiPnVNdvEearsQhr8xpQwoAzmNga/GKKqm6QsS/8fvVP/t/U - aAEJAhC6BySewomcVrQJ8c23u4ZiLRcUqhw9CGnx/ur+DEZyHRm4PoEM85x7u1sR - 1a1ptn8c7MARURCSD6+MXb+8/lr/o+Ca0AWl0iKHaDJHAIrvC5GfK0nj9BwHFdaM - VcEPCk6zUzG+ - =WzPE - -----END PGP MESSAGE----- - fp: 687802D4DFD8AA82EA55666CF7DADAC782D7663D - encrypted_regex: ^(data|stringData)$ - version: 3.9.4 diff --git a/kubernetes/main/apps/default/seafile/app/helm-release.yaml b/kubernetes/main/apps/default/seafile/app/helm-release.yaml index c9e278d0..e0e55c0a 100644 --- a/kubernetes/main/apps/default/seafile/app/helm-release.yaml +++ b/kubernetes/main/apps/default/seafile/app/helm-release.yaml @@ -28,14 +28,6 @@ spec: image: repository: seafileltd/seafile-mc tag: 12.0-latest - env: - DB_HOST: mariadb.database.svc - TIMEZONE: ${SERVER_TIMEZONE} - SEAFILE_ADMIN_EMAIL: admin@${SECRET_NEW_DOMAIN} - SEAFILE_SERVER_LETSENCRYPT: false - envFrom: - - secretRef: - name: seafile-env resources: limits: memory: 1Gi @@ -65,3 +57,10 @@ spec: size: 150G globalMounts: - path: /shared + config: + type: secret + name: seafile-envfile + globalMounts: + - path: /shared/seafile/conf/.env + readOnly: false + subPath: .env diff --git a/kubernetes/main/apps/default/seafile/app/kustomization.yaml b/kubernetes/main/apps/default/seafile/app/kustomization.yaml index 8917b3b1..6af72b88 100644 --- a/kubernetes/main/apps/default/seafile/app/kustomization.yaml +++ b/kubernetes/main/apps/default/seafile/app/kustomization.yaml @@ -1,5 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ./env-secret.sops.yaml +- ./conf-env.sops.yaml - ./helm-release.yaml