From a91561f513f7d88b60a467f68563273562247bc8 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Sat, 27 Apr 2024 17:49:33 +0200
Subject: [PATCH] chore(zipline): switch to git-age

---
 zipline/.gitattributes            |   1 +
 zipline/config/base.env           |  15 -----------
 zipline/config/zipline.env        | Bin 0 -> 1193 bytes
 zipline/kustomization.yaml        |   7 ++---
 zipline/resources/config.enc.yaml |  41 ------------------------------
 zipline/resources/deployment.yaml |   4 +--
 zipline/secret-generator.yaml     |  11 --------
 7 files changed, 4 insertions(+), 75 deletions(-)
 create mode 100644 zipline/.gitattributes
 delete mode 100644 zipline/config/base.env
 create mode 100644 zipline/config/zipline.env
 delete mode 100644 zipline/resources/config.enc.yaml
 delete mode 100644 zipline/secret-generator.yaml

diff --git a/zipline/.gitattributes b/zipline/.gitattributes
new file mode 100644
index 0000000..b00dc4d
--- /dev/null
+++ b/zipline/.gitattributes
@@ -0,0 +1 @@
+*.env filter=age diff=age merge=age -text
diff --git a/zipline/config/base.env b/zipline/config/base.env
deleted file mode 100644
index 8f703c2..0000000
--- a/zipline/config/base.env
+++ /dev/null
@@ -1,15 +0,0 @@
-CORE_RETURN_HTTPS=true
-CORE_HOST=0.0.0.0
-CORE_PORT=3000
-CORE_LOGGER=true
-DATASOURCE_TYPE=s3
-DATASOURCE_S3_ENDPOINT=2df513adaee2eeae12106af900bed297.r2.cloudflarestorage.com
-DATASOURCE_S3_PORT=443
-DATASOURCE_S3_BUCKET=zipline
-DATASOURCE_S3_FORCE_S3_PATH=true
-DATASOURCE_S3_USE_SSL=true
-DATASOURCE_S3_REGION=us-east-1
-FEATURES_INVITES=true
-FEATURES_OAUTH_REGISTRATION=true
-FEATURES_OAUTH_LOGIN_ONLY=true
-FEATURES_USER_REGISTRATION=false
\ No newline at end of file
diff --git a/zipline/config/zipline.env b/zipline/config/zipline.env
new file mode 100644
index 0000000000000000000000000000000000000000..51970e91f5524a349f1cfe4bf21dcd35bc3a2c49
GIT binary patch
literal 1193
zcmV;a1XlZDXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zVLM{HU*Qf63dOLk~?
zMrk)zaXB<oS9U~7GjTL^G-6J0Z!uDNYC$l0SaS+8Q8h6_G;dB)cT_Z3Y<6a1WnxWM
zOj%+@Q7c4QWOg`McQs;ZFjG=^O?L_{J|I{!H8n9gAb3MYT6Hsacx`hwXDdNhYH)68
zHCZ)xGdVL*P+?IyXiIi9D{FEwV@Yaj3O06GF;IGKY-d48VOV51W-Dn?b#GKmHDP8r
zXmd?3Xg4@(NoPSaT1#wa3N0-yAW&6ja5Z#Ia6~zIMMimSc~g38Lp5n<Y%xMoS7Bj6
zG-^mpYG-U^S4B8k3N0AWyl<&0uY7R5gaWN-6g$R?Ggn;)Zs!cCA@^I~#SGVJswS2U
z=|`fL>V{!hZoevIGwoSlbzFr=bOv}%#i$1I&Tlw2y;rx6M2Pi8`VTF3{1~5ogH$Mw
z?AcZNx;5q}$LvCL{2^B3j7zfgR0zD)4;0wkLQC{(nV??)?f^Zki#_lD#tg&=+R^U_
zA}-}2V$>eCTT5(aSV=Tv!zHNpfAvhZQGah_s%bKPd%fi<GMbUux|ZE%XEv!j0E5Sg
zr^SsOyV1<G_cc2;pb5WM&0*>Mj(V9$9Zv#dWbH3x6j5x~3v?;iF8Trsk((rh+uXiH
z<_%13po@~M)coLQZ7?ak!~f8rV#Y(f-;yShkOHdT%O!yPT5+47JQa+z4RaT_tm;kN
zlLEM6flyO}UGt%q(4aJCXgIdcQS$_A%fM73I-fDD{^#6+u~C_$tO9&t%zPyZ^i=iX
z2$K{mjIhmlzzQDo5~7Y$jumpmnVhA1TzOecE-p^>)@sGVx!g3B!K;=|5H`+{(Y%iE
zizVU0qs8mdh`U46wWeg{X2h3W$+_Xb9<oyaEhzehGn{xZViy+5d5n3|$~(Ns+i&5_
z4RB8@sd{O|Sy3~of|=4;zgKq_CuYA<1(BIM*11XJV*c^W3$B0axeK{a#M^!P2R7?C
zk--kb*>nhvgv+)5gqv6JM*oJ>E{0G5AJi3LT_Q@%L>SaO>s)KVWR_{@x+FX#$_WqT
z4t{Tkur;x571q_`Bx3Wz5CJXeP>QpL{UY`q0+C<c?w_v%$h$uV^0-ke;9Zm`?)G_A
z?NF<i)kR4ci62eMe+Z4#Ws(+MVj#5U606?#=jF(Bo9m7m8`K+v)yp84wn=SvzW=xx
zy<dT_5|}`36wbm-ZKV=BNpc-p_7~cZsQE!mx=A|;R|ymU+>f0!%f~BL^vP0i88t6`
zka0n-N{Mqd4(l?W@W#>Wf0S<SacFi*t3iEcbLA4}QMRrqlXrTa+C}MWuX1)gw!6%u
z(~)M3B@}r@5#H{XI_?pp;JnO57&iWiL}kqXx7K3vFhNM@48mbuY4q;nuakw0S0C$M
z&^yh3yyFCWZFRxfH{1YWtyN0Ig{xa6SGhV&<1?W>GlH!T-l(nyY|X?Rz0Ekp_uf0@
zC)BjR1q}nRhz}J0GtGuZpwV(X0Z`=_I6n5blTX~o)3`dRJ9tvcNKFDMG7KEtp11cx
Hw{_Ns838H9

literal 0
HcmV?d00001

diff --git a/zipline/kustomization.yaml b/zipline/kustomization.yaml
index 55e4e50..c3ecbcb 100644
--- a/zipline/kustomization.yaml
+++ b/zipline/kustomization.yaml
@@ -20,10 +20,7 @@ resources:
   - "resources/service.yaml"
   - "resources/http_route.yaml"
 
-generators:
-  - ./secret-generator.yaml
-
 secretGenerator:
-  - name: zipline-base-config
+  - name: zipline-config
     envs:
-      - "config/base.env"
+      - "config/zipline.env"
diff --git a/zipline/resources/config.enc.yaml b/zipline/resources/config.enc.yaml
deleted file mode 100644
index 09a7a08..0000000
--- a/zipline/resources/config.enc.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: zipline-secret-config
-type: Opaque
-stringData:
-    CORE_DATABASE_URL: ENC[AES256_GCM,data:5wI/kj0+X2vx4898sQS9Axhgp20IQh1xpbQgZOgobvYRvPxni7ad3RDd6misLSGF4eTeNWn7LQltf5aONGmvC6C6ueAF+sZhnzQPRfXZS2msiL8CtWXaON3Vo+boPqUNfoGHpg2+NH3tm+L1r3HwZDQkWg==,iv:hMTkTw/oLPFs4XVRnCViKNxKmE7OBlcLQa+aXgqnWes=,tag:Au1mkU0XBQPPumGvx+VWvw==,type:str]
-    CORE_SECRET: ENC[AES256_GCM,data:taa93xNb8h0vUVdWgDQ69+PQr541weQQmGJWau+2fXdTm13VtOLv2sH430Y=,iv:vxh60WKz2MM62O1AA4Uzxsz8rvxkdQTKxBfpjAOa1KY=,tag:OF5fOv5W+2U4yaRHOo2ohA==,type:str]
-    DATASOURCE_S3_ACCESS_KEY_ID: ENC[AES256_GCM,data:WcbIP7ir/5/j14GSXprxNGSQxnNhSxZHdqNk5k4EKy0=,iv:fCWBiA2vXbNFTQhjaoOl5Lhy5oKmIfnJr80El3O2SXY=,tag:uaPwWdtR2y07nuxzti14JA==,type:str]
-    DATASOURCE_S3_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:52dOiJH4BxDVgHBLGAHVv0yocB4VWJx7RPUQ4ge012T9gU8k2jYJ2Y3aL3Y+mFqdB24S6HJZ918dR0aglhiQyA==,iv:j+cs1zkb3VY3AVdbGeNcdIJ1S9ytSwfxwGt5/S96dsI=,tag:iy+Xgc97GierA74BYtHMZg==,type:str]
-    OAUTH_GITHUB_CLIENT_ID: ENC[AES256_GCM,data:7a773t7iacejEQayPqUbkKxL2XY=,iv:tfZuc2oTEmB/LI1BvPTbPVoA07kSW0AG4FH+8yJ72/A=,tag:B/kD0/rOW38trSpe+LVH5w==,type:str]
-    OAUTH_GITHUB_CLIENT_SECRET: ENC[AES256_GCM,data:IgxkqECtYbUdc3u/o2AATlQVkVPtcRU0+zvjwBLWNoPYdneWd2YBJg==,iv:XQq/HjK3wca31T8g5zqIreJ58Ar6GptLK3Um0Eh1CHY=,tag:lfvAOFAtj57mPPHdIdW7mQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age18e0w4jn03n66qwg8h3rjstz7g5zx2vhvz28aterkfkfetrxtpuysftp6we
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEWWFBMUF2aGpEK0dNdGQy
-            aHdxY084UnNZS2xrQ21McnYzTlpsOFFwVjN3CkRuNWlTeE5ObEFwRGZsekJFV3pJ
-            QW9mNk1xMDBmb2hlRENRUGF2MmF2NGMKLS0tIFVtUkdyWU9ZTmwxSVh6dVRIM1hK
-            Q3NxUHV0T2JjM0krZStCWDQ2RmdRc0EKS6LHARFCZ/9Vww3TyhrEBgvOY/lWGDLP
-            cRvq9w+7qQYgsO0KCC+hfxDVbtZdbRku/2ZXr9cv8Vv/PgFJhwHScA==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1yssdnqk90tn6zzggmwt70krndw04yfk9hwzdac3wsgfxmttngd7q89qzjr
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmbVZXMUFPbWovc0lnek5J
-            WC9zaEZTaWh1V2pLbFhBQXBvSjBtcFp1MGx3CnFRSlpGTkJEMjNhd283ekNhYnIw
-            Q28rS2trMVN5UWljZkJoTmdHWjBNeEkKLS0tIFhWYjV0TzhnVzAyT0RvWHB5Vjlm
-            eEQxM25tM2FxY1RvNEhxQWk2cE1wdTgKFq1rbrN1ScKuujg2xyRaESwswoMu2+zr
-            LvIVDhLTl4jyUb0WH8Iy8/xQhUhsp7KJnccXFoCc5TFE7QzEKfrv6Q==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-11-08T20:23:36Z"
-    mac: ENC[AES256_GCM,data:+PwY2NaAQTCbWAWl5sovsb0dang4WmUBI6FIjtwn2OzCIkUkvKvsHOl5sVoj8DyiQJT46Ui4xDwB/kKDUwobmQZXxaorJrEmBv1tfF7NBXIilrs0JWprxQ/0AZZY94KrQ/1lgcZ/a+Ax5JXDUxmHh81gM224X2sHLKS4tAaTfzY=,iv:vWHbCE50vIoI4uQMexywNB+HiBo43F2Ne067ITK2f1I=,tag:q8zqd8FCjdEYXhADlOg/yA==,type:str]
-    pgp: []
-    unencrypted_regex: ^(apiVersion|metadata|kind|type)$
-    version: 3.8.1
diff --git a/zipline/resources/deployment.yaml b/zipline/resources/deployment.yaml
index 0470eac..f3dae9e 100644
--- a/zipline/resources/deployment.yaml
+++ b/zipline/resources/deployment.yaml
@@ -18,9 +18,7 @@ spec:
         image: zipline
         envFrom:
           - secretRef:
-              name: zipline-base-config
-          - secretRef:
-              name: zipline-secret-config
+              name: zipline-config
         ports:
         - containerPort: 3000
           protocol: TCP
diff --git a/zipline/secret-generator.yaml b/zipline/secret-generator.yaml
deleted file mode 100644
index d662774..0000000
--- a/zipline/secret-generator.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: viaduct.ai/v1
-kind: ksops
-metadata:
-  # Specify a name
-  name: zipline-config-secret-generator
-  annotations:
-    config.kubernetes.io/function: |
-        exec:
-          path: ksops
-files:
-  - ./resources/config.enc.yaml
\ No newline at end of file