From 1c2d71391f6abfe07811d94620a25cc93aaf0d80 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Wed, 17 Apr 2024 21:31:55 +0200
Subject: [PATCH] chore: migrate fider to git-age

---
 fider/.gitattributes                |   1 +
 fider/config/base.env               |  21 ------------
 fider/config/fider-secrets.enc.yaml |  48 ----------------------------
 fider/config/fider.env              | Bin 0 -> 1326 bytes
 fider/kustomization.yaml            |   7 ++--
 fider/resources/deployment.yaml     |   4 +--
 fider/secret-generator.yaml         |  11 -------
 7 files changed, 4 insertions(+), 88 deletions(-)
 create mode 100644 fider/.gitattributes
 delete mode 100644 fider/config/base.env
 delete mode 100644 fider/config/fider-secrets.enc.yaml
 create mode 100644 fider/config/fider.env
 delete mode 100644 fider/secret-generator.yaml

diff --git a/fider/.gitattributes b/fider/.gitattributes
new file mode 100644
index 0000000..6c2aef3
--- /dev/null
+++ b/fider/.gitattributes
@@ -0,0 +1 @@
+**/*.env filter=age diff=age merge=age -text
diff --git a/fider/config/base.env b/fider/config/base.env
deleted file mode 100644
index 70c4000..0000000
--- a/fider/config/base.env
+++ /dev/null
@@ -1,21 +0,0 @@
-HOST_DOMAIN=fider.icb4dc0.de
-LOG_SQL="false"
-LOG_STRUCTURED="true"
-LOG_LEVEL="DEBUG"
-
-# Metrics
-METRICS_ENABLED=true
-METRICS_PORT=4000
-
-HOST_MODE=multi
-
-# SMTP setup
-EMAIL_SMTP_HOST=smtp.gmail.com
-EMAIL_SMTP_PORT="587"
-EMAIL_SMTP_ENABLE_STARTTLS='true'
-
-# Blog storage
-BLOB_STORAGE=s3
-BLOB_STORAGE_S3_REGION=us-east-1
-BLOB_STORAGE_S3_ENDPOINT_URL=https://2df513adaee2eeae12106af900bed297.r2.cloudflarestorage.com
-BLOB_STORAGE_S3_BUCKET=fider
diff --git a/fider/config/fider-secrets.enc.yaml b/fider/config/fider-secrets.enc.yaml
deleted file mode 100644
index 4c80928..0000000
--- a/fider/config/fider-secrets.enc.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: fider-secret-config
-stringData:
-    #ENC[AES256_GCM,data:vwh0HqyenM9A/otfsYrVAIYoivvbQ/IZkrohaeuMSRLDFpnr5TDD0CY93N84,iv:Y4RTLSQCKG9YIsyALJXVnSU9KRVPViFiNah7cpPj7ws=,tag:V5+AGSJ3RlBh18oVI6QoFA==,type:comment]
-    DATABASE_URL: ENC[AES256_GCM,data:I1FYx2MxmCVRv5f7TdyjFLElzbA2kPuwYHTtFeECkfBChNiVNgVJnKKTdTvfHgz9tazME8e8FzVrbQ+XkTaTnT0vPtDISTuzPbq4EK+wDQbmz+M0BW7Me1wz2061NVd+uXpFWaj6jg2PcY41TYptT6s=,iv:J2isIwnf4wkObZSSIBWyjiFNHDwOw+jT0/kGOtAbV9M=,tag:HiK1ZA3pv4uohTKWvVrmHg==,type:str]
-    #ENC[AES256_GCM,data:QXY/wGzJDrdgfEwE/Zq98dQ=,iv:3ZC3JGlZeBslZN5a5ndYoNA4BwdZ8Kb49tNrJXh3c74=,tag:i8dp8nj7ZUO4H25mCJFJZg==,type:comment]
-    EMAIL_NOREPLY: ENC[AES256_GCM,data:1lBgr0jlpfqapy/Be5y8y/9iSQ==,iv:duh4+wgwMgprUPr5jNtLvm1RG4gLB8zRUW4KH+aQIGo=,tag:b0D3PGDsEvjj6modicar6g==,type:str]
-    EMAIL_SMTP_PASSWORD: ENC[AES256_GCM,data:ldpok+OwavUpP487Gh52I858MRuTITiVdQ==,iv:RBcKpTo/F6Wqc715U89VCdojEemwHEjETTPZP6z3lj8=,tag:3eye+x5YqS0Y6oP75lE2BQ==,type:str]
-    EMAIL_SMTP_USERNAME: ENC[AES256_GCM,data:+ft+YqLBBgqo0AGl5c1dQyl4Uw==,iv:t8pt2lj2sht3nMyfzCQoRe1hYapydvQt0ylDUxBLieo=,tag:lxMQ8bIjNZz6y+jgBedMyQ==,type:str]
-    #ENC[AES256_GCM,data:tKFIJYaKj470Wukj+0kh,iv:iVl3U363ioCdvOGBxAq+on9PLHqPeZO9Zs26kP9z1RQ=,tag:4KDR6lCtgwZVuJ3Uc+LuIw==,type:comment]
-    JWT_SECRET: ENC[AES256_GCM,data:8xfY6sn3yVVd6UwqmDj5VR9kjf91GJKkAxxNwVPI7mfeoPkH+xdCVon88SHQ1Lh7XRDeWK/Fjt6LCpWqlntwBA==,iv:p2pL9B3QdKPb9Ifup9zMZlKYGJM0s+L7+P0buI6855g=,tag:gQWBoV77HsH9TAk6CUxKJQ==,type:str]
-    #ENC[AES256_GCM,data:tRPJxSMKKV36Tm28Om1xg6RFvKckNLFClw==,iv:qhAuF4zUrwgPyIG/2U28fz3FWbiOCDBtzhO7jux47Bg=,tag:BfOepgY9Z6/BfOwfNar5YA==,type:comment]
-    OAUTH_GITHUB_CLIENTID: ENC[AES256_GCM,data:EGvHYukKGoeqJtFkTDnJoXGGzvg=,iv:CrPC/TUd+A9jYt17R2MLe4h+OArcZPXMbUbn/e+1S4o=,tag:ptEDPa2FmFfHaf0IV+hIIQ==,type:str]
-    OAUTH_GITHUB_SECRET: ENC[AES256_GCM,data:EX4MeNyiJfOOM5tpIiVsWzN4PwxGKaiuEp/x2yLB6DKERUqnXBjPHQ==,iv:zIzv5x43gurxC0OPZAJ15kMuK/0YA8UWULns49W8tWE=,tag:yq/IT69Dk7BtJ5k+8HNu6A==,type:str]
-    #ENC[AES256_GCM,data:yepnpyfmV9t5CRucNg==,iv:186ZrE/ynkFhDjcmbdY+0eM//BWDMkQKQkUUj2OX0gw=,tag:3zjeG1sveTCCARG30vrtQQ==,type:comment]
-    BLOB_STORAGE_S3_ACCESS_KEY_ID: ENC[AES256_GCM,data:h6C2TxHcBJH5a2+OGckctvKUnXLbe8gbH3OpQ1s8znw=,iv:VtB1MAb4lqUcPbSQzf/o1bPFEqtd9FYhdrItLIv9GQk=,tag:MbuJfTZPJSSzT/89IDXCig==,type:str]
-    BLOB_STORAGE_S3_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:nFbcxS5IJz2YOJZx15hRYGrfGdcN7FI7Z2k1C5uLRHXllqvbRw09ZFn0ed2ORH8mDSl/0NHzjtD4cTdZ8L/fOg==,iv:4Vgb9qBQD8kgr4iBVEsaQTY+i58MUu+Bu80XjZAY78Q=,tag:VSp88f5T+WV2ngvW6mHbYA==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age18e0w4jn03n66qwg8h3rjstz7g5zx2vhvz28aterkfkfetrxtpuysftp6we
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1MHkwN1AyY0twMzlYT29D
-            bXBPTE4vV3lCZFROTG5FS2ZteHVWbjE3clVBCmFWV3FVYTMvejBINzZ1Sk5lcEFF
-            NTMvSWJlQ2Nad1oxNkVJdFlHbkdja2MKLS0tIDFicWs5QUlPeVpieitqRVNhSXEy
-            L3JKV0YzOUcvLys3TWd0Q3pOcFBsczQKxyY1BbhiAcFnEwMO3uEEssGX4vM9pjwo
-            0hvqWULdsl6NpVd91lOpKgp9XwROSKwdYp5U0XX4oRF1mAI137a8WA==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1yssdnqk90tn6zzggmwt70krndw04yfk9hwzdac3wsgfxmttngd7q89qzjr
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0SHY0STF0TGJia2dqRk5k
-            QVpUeEsvUUpaUjBzOGtNV2dlQzBSNzVZNkRJCkxNc3RBUmgwVDBId3pqY2R6eWNa
-            WjZ6ZXV6RjFaWnp4ZXUveHBsMG1DR28KLS0tIEVOeGFPTUszbmYxU1hYZENZUWdl
-            bTk2dytOMmE0UkZYNUdOWHZuelJBK2sKCT4UeF/m0mMqs6jbT1KMLfx6YTQTwkbK
-            7WcJKPlg2Jqmqi2G1tqKcjMui0g19vKPRDWGdtIOyYB83ThAVG0znA==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-21T20:00:49Z"
-    mac: ENC[AES256_GCM,data:wDVyJOyMbbcQf/LIypuKIXYskE1+xlg43UY2NV3xIRZfVxN4uAJBtEEas+T6Y3jJoLJOkwjzkvncCv0cxzlJSQYmfoidaBIpNPKi6fSR1LjxELG0ErblVY/usgJ/ACvIfN+6SUC1sK/wxIbpLT+8TeUCvHEj/iuq0hslgdsomks=,iv:MdET9ouW4AVsbpLDtLpHzGQ6RTAHx3GvJg5TVaMzNug=,tag:UUDSIeK0cfd7Otn2XlsxlA==,type:str]
-    pgp: []
-    unencrypted_regex: ^(apiVersion|metadata|kind|type)$
-    version: 3.8.1
diff --git a/fider/config/fider.env b/fider/config/fider.env
new file mode 100644
index 0000000000000000000000000000000000000000..1f5d6422d59a438980d5e049d85106eb7c5c110c
GIT binary patch
literal 1326
zcmV+}1=0FpXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zVeLTGh2MPz0#Gh=pc
zc58PyS3`7dK{H7!W@|-LRWLDhY-&YDd0J30Q*R15O*LjKWN=k!b#-h(L~vR#F*qwh
zP-HPsd1GZTZb)xvQZRRDY)x@Ua$^cDEiE8$Q8Z?DN>6J?T4HKAW^{H-I7)A4aYQzE
zSuj&tFm-8cd3RYtSwlrdVp$4qH&4$A=Q+h}3_@lHlT}moPm2|;Q7XbF@A1BP{EuR5
zO5c&VA0)iT)oPzh)n9BarIIgV3#fMa(C|LRArHV}xaK2?Is2u`4RQ28`S&;>u?>Ki
z@!Qb3Qy~J}1}?c`!P2(Vu`w01S6<F#^N?%Jp8Acx?H@wlu4%K<xS}XQsF<XuuJ<*_
z(;0p*&S?Uiz#}aSfGg@I3>g59J~%@?2I<a*_Ok?)gZP$i76Y-0dyix+6{{jZhSwQX
z0TgCUXrcs)Rrme6`odIUf9T#co96%m!F?`8eS2lwXx=o5GCefRi02U7k}=e4R9PPp
z0}-nSq_yE%^)n82h?D^>%h-~H8g`!>{PvrDI0UhE-pW8^<LW!J=KKbbw>%KHFp)x~
zM$2(l*1`CmY`CXB8*7B>fO~feZOHt?%8ETjHfi*u6bMoAYrln3U+-!O5pTe<`0<l+
zBkevBKaz|L`c#T>#N&w94J4z4s(a=*W$(d`W=gnNnr4R42yIYV3|U9WdoH7e3=%U`
z-}VY5nhPoiXA3Fr_Xa@3<RnRv-K#gSv;xlhzz-t!a(dgW=oIPz35RaZ?)ZE}zE9n9
z1jL$%flLz`6eOvF)~fmau~6&faNGs^{@$tU8=MEC(NR<*tWk8BXP(~CnpnFv1df8U
zKcKv{bG`CA+4RNsjHI$QK$RGIb-+)F`sE}=)&E(TJCz9PZ;}*)8aZdh+~BIywv>d)
zN8+e$oGTyoTGtjt0*5#L2g{cBt%?tZJ7h$_Tt8MZ)&b~w)3t=KMkK1dM`=170$SpW
zuIm=bZTOxDfiNVks%-E)Cy~zB`*LGZ<{e*^A;3eeME3)4Hsnj3-XNjdcHQ#kavUH7
zPXHWlxoK`8UzK4bKWWDIj#pEJC-vwgzw)j~6S({K+GkvjNLIyxwhI1*4dQuCiJfii
z(|&&#?`mChZZ+nPG!!}~awzDWe}24o;oO@|E_{TA#oo8_4eGPF%=|lDp?cyB@N;QS
z&Yu26$0eG|D7O$$R&-0hQ=7Z<tOmGR><&8k--rf!$h&C#4~aM(e)iIfg)U$>RmZ3<
zoKl<lZlDb_M;Sk$Yzb?98(z8E8ayF@=BWdpzS^kM@kn1RDpPK)Hg<2`_udiu#n8oK
zuQjM)@_DWU)XZRQ7XQRhGM=jNP6*W2nDRX*&&1HH^X6W}edm{BK}o(YR99t*S{=P~
zga8q4qYT=J(fm1gu@zC6YL$2aJXf?Tvj(V_QcTP0&~Cy~<>r7wN3C!ToP>}6!OyIX
zR3euw+s^JA(JhJsWUQw_Ym(H|^*p1b{_PB`PbMXQ-yf=VlOET}YQLr~x$;pD-&fux
zNM?hW8dZ;6!!atm$=;6dQ)z}oa}(WosuOjc3j5$#;b$K$Tl7Pe$X}|!9TZS8t<Nse
zUHsBStr_D3pPlAT?0iOBs`C|<M|$CQ&{TSQgq%|MbTIl1-?v~=nV#M7pi}9zP%&7{
k`r*#%dytgBgQVF-ObLdY<-}`33UXd5%an!(AcSxp^9xgeTmS$7

literal 0
HcmV?d00001

diff --git a/fider/kustomization.yaml b/fider/kustomization.yaml
index 276a70e..8846335 100644
--- a/fider/kustomization.yaml
+++ b/fider/kustomization.yaml
@@ -16,9 +16,6 @@ resources:
   - "resources/http_routes.yaml"
 
 secretGenerator:
-  - name: fider-base-config
+  - name: fider-config
     envs:
-      - "config/base.env"
-
-generators:
-  - ./secret-generator.yaml
\ No newline at end of file
+      - "config/fider.env"
\ No newline at end of file
diff --git a/fider/resources/deployment.yaml b/fider/resources/deployment.yaml
index ea053d2..f5f810a 100644
--- a/fider/resources/deployment.yaml
+++ b/fider/resources/deployment.yaml
@@ -23,9 +23,7 @@ spec:
               name: web
           envFrom:
             - secretRef:
-                name: fider-base-config
-            - secretRef:
-                name: fider-secret-config
+                name: fider-config
           resources:
             limits:
               cpu: 200m
diff --git a/fider/secret-generator.yaml b/fider/secret-generator.yaml
deleted file mode 100644
index 0aa7075..0000000
--- a/fider/secret-generator.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: viaduct.ai/v1
-kind: ksops
-metadata:
-  # Specify a name
-  name: fider-secret-generator
-  annotations:
-    config.kubernetes.io/function: |
-        exec:
-          path: ksops
-files:
-  - config/fider-secrets.enc.yaml
\ No newline at end of file