From cda448a94a2dce749723568335b68835c9a96276 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Wed, 17 Apr 2024 22:21:38 +0200
Subject: [PATCH] chore: migrate nocodb to git-age

---
 nocodb/.gitattributes            |   1 +
 nocodb/config/base.env           |   9 -------
 nocodb/config/nocodb.env         | Bin 0 -> 1407 bytes
 nocodb/kustomization.yaml        |   9 +++----
 nocodb/resources/config.enc.yaml |  40 -------------------------------
 nocodb/resources/deployment.yaml |   4 +---
 nocodb/secret-generator.yaml     |  11 ---------
 7 files changed, 5 insertions(+), 69 deletions(-)
 create mode 100644 nocodb/.gitattributes
 delete mode 100644 nocodb/config/base.env
 create mode 100644 nocodb/config/nocodb.env
 delete mode 100644 nocodb/resources/config.enc.yaml
 delete mode 100644 nocodb/secret-generator.yaml

diff --git a/nocodb/.gitattributes b/nocodb/.gitattributes
new file mode 100644
index 0000000..6c2aef3
--- /dev/null
+++ b/nocodb/.gitattributes
@@ -0,0 +1 @@
+**/*.env filter=age diff=age merge=age -text
diff --git a/nocodb/config/base.env b/nocodb/config/base.env
deleted file mode 100644
index 18a3702..0000000
--- a/nocodb/config/base.env
+++ /dev/null
@@ -1,9 +0,0 @@
-NC_PUBLIC_URL=https://noco.icb4dc0.de
-NC_TOOL_DIR=/usr/app/data/
-DB_QUERY_LIMIT_DEFAULT=25
-DB_QUERY_LIMIT_MAX=1000
-DB_QUERY_LIMIT_MIN=1
-NC_JWT_EXPIRES_IN=1h
-NC_DISABLE_TELE=true
-NC_ADMIN_EMAIL=peter.kurfer@gmail.com
-NC_REDIS_URL=redis://nocodb-cache:6379/0
\ No newline at end of file
diff --git a/nocodb/config/nocodb.env b/nocodb/config/nocodb.env
new file mode 100644
index 0000000000000000000000000000000000000000..2ea6d4236bb3a85b17f7b58eacc8e37d39707e44
GIT binary patch
literal 1407
zcmV-_1%UctXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zVjXgFw3XiZ6PFf>n5
zST`$WV`FqwZbUIzWn^+_b#i1jOhrX+FgQ|aY)uMkLveU7FiT5ua!p|~XhvypNK`~N
zO-f=`cvD9(NNPz_FJ^c{FK1XoSWyZsEiE85VRmmhZ&@*BR#r|#W@2hfbwP4CM@~gS
zT3J;zVOd%;b~sLJG-66YM@<Sadz?RSno{NL`&+Mta9*(86QRy|>evd&Q{#TN1n364
z2L)b@&{;j4c+zZxs*?4Aewr;OOlWuh34~rteI%*3e`MVTiuyn1oW5)4?Ubny(9o7&
zm5{68qjB8lx6!sTT;U*`HM~qYg=u@o1V3e-*?HwJB3$&dTTXPf5&oGRu3dDoC@k%H
zLWn5#r6n|EStc<sgNR|k&{IjL@4QX>eplD|lCnydsO)Y!btFuT&>?cFQ15XN8WBxb
zm_J4|p8~1ET|x^f)AeEL>Ul)5SS27<Skvg-!*=8)a}N414^{DIWMR8KNAp^=>S^vL
zUuWC<z3#j4g_QPP%^YbQ<+ESDQ=H}7*~A^3kQ8h-XRXPewJV4KRfH6%NKSOa%dj&r
z?!|)?kW9LWKE9z;FjrYh<!+>_PFInI&8t>NQ-3Hn5kCq7K#<fzduu(YI3&q3dfKsi
zB0NmFC5<J~@7Y)W$X@-NIt4_m(zFWtAur0l4b|5Of&VYMZy}kVKa5T)_c-90H~PQ5
zt*PR7FsPxCjmy}!i;DERE<83@0SQc8?vAM_R{`hxr!%x_18E|-ZyQ_nF>^8Juq6Yn
zyXgvr9~bt2hhDl}t*u?e9trnX>!Gk5TxkiFVi@Y?<_#hjt}5*L1(a$wXG%^x8O&+H
zQ>x~b+Y*Y}vWur3s_7!9rd$CL27=4?)@csa<8nDo4CpCRkX6Tz?^-K2>%H>URO<N}
z#l<t#3UV8mm+$tZev#>Z<qbtS191HhbVA<twG*Pn9Xt2*QSL)(xw<h=+TZSP^%<7g
zmo#}*_-S5}CtA>Fs8dzAPROiuVCAKr&v5Z+dljA{!2Cf__rd518HF<i9CwTyM2GZ4
ziEX9Rf@fj!^B8erSFpbqQy73AZ+2N~NeV|?Ead*`G9S&Zzq+_`D>M=y-;N?z=P#_;
zD$Dtxoo@???L}YuTl5-ty~aMIiO0rB1&hQXbj5j{c4_s?uj{s=DxS}A=w&?xg|S5c
zQ;&5-fsFN`9OBsbh5F4jH<tXSd}Am~M|gcfem9XF_9<b3CPQUOIYaMaY>=q5+^nW=
zsxa4ewbUJ)zSEUwAkFV<gjlkJ1Gr>nU3=A2ZOl}Vg#uBeF0Pu;8qU2kQBeD87(<lw
z%z+CTBy9@5Gl8VxtT>67I@MD^9V>-tg_9nCJg(&COmKJ8=)RV?oNDj_M4#Jg+T~+6
zwUw^r!N8svS;OjIJLXX?MTB0ztMG-ZK>LS`dA%b4eCG%>FSO=i)a72xL5y0LT(7ke
zxxAh?J>}Gsl?}7XxvCST*H4uOg(yo%mT8VO9!Afg3sbFwesyXJmvU$+qqs91;JT$P
z7S6v4QSU&fCt}|l?0WnML_?ryGTYoIHy4o1VG<w{)DKWd<u1x_c$!kfy!%dB#-=;P
zGEsc=4v~N93GWQeAS`c`8CD8OIHDueqSi)`Hgy8jgGdrQQ&vt_^gDEMa2gp^{_T=?
zwkI+ICYk9eC;k^ydl1?F4(mdft{7Kq0!=PTL%1tk=VqH{bWzC*YQGM1ZuW>X#05V`
zAr~FkE<E=-E&JEep-$+tCI$}iOo4&R_)%ZD#>5Vn?q^Kv?+HZ(n6c^JV`a|8bJXBk
NuaU;VT?CA^oWux=oh|?X

literal 0
HcmV?d00001

diff --git a/nocodb/kustomization.yaml b/nocodb/kustomization.yaml
index 798885b..123b5a0 100644
--- a/nocodb/kustomization.yaml
+++ b/nocodb/kustomization.yaml
@@ -22,10 +22,7 @@ resources:
 - resources/service.yaml
 - resources/http_routes.yaml
 
-generators:
-- ./secret-generator.yaml
-
 secretGenerator:
-- envs:
-  - config/base.env
-  name: nocodb-base-config
+  - name: nocodb-config
+    envs:
+      - "config/nocodb.env"
\ No newline at end of file
diff --git a/nocodb/resources/config.enc.yaml b/nocodb/resources/config.enc.yaml
deleted file mode 100644
index 3aa7fad..0000000
--- a/nocodb/resources/config.enc.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: nocodb-secret-config
-type: Opaque
-stringData:
-    #ENC[AES256_GCM,data:Hs6V,iv:5x3mHRFQ64to+CJGDDx+JNW1IEnHJ/ybe6JeecPJNeE=,tag:PBkuJceINQDF0YdjqmtcjA==,type:comment]
-    NC_DB_JSON: ENC[AES256_GCM,data:z2Ersb4CH2aQKdO8f4lxWfxUnNvYA5ese5hMsAnDT5uuaSGCUIIOEYhbREbbu/3rZhIrOMm10S3DZAlDDmc+Z1a4UeRHTsO5WEA9eyMG4mq5+6FV2FELORn+23jhpLgn9rP17IP5fSPlmWp6RdGsdsvXCFbHrz5YEofIlxJYQDL8ix/toTkVjKynNheqzU2bSyTQTfC7ZzDmGaCw43OtB4lo4S1flrNDyZubsqIAM3E8igOCTLbXf7ak9AMwTIs2jo/HAj5ErWXcdgBUZkNOPOYGbdKAIBdMS49EUsX4k5CAKZEmU14VGdWYwwpthAQ2osOELuZleXdlAdkhqFGgBG5zwKpDqV5EZ9HkbQtgL81gDnVR+nVXgU/Lnor2qS32szWl3xNskk0wyB/9OdbvJwV4L9yuLW0rwWI07aBWRACfXAvtDL/kUi7YPzC2ZueFw6628Bfjif3gUbm++plNpkDPKJw+MJRXvDqjCnB+ewaZ7O1nqQh7BjO0ZjkrOsJqm1HaCr8FpXVc5i8PrkYCIPrVA8zcdbu7AO/ngLpmN7AfcXOwjXKdFKdtwVgkK3mJBh976vGFRPTc0+4ENt3OnDVRIb+A0AdGuqWWNp9ctkjDGv4Ne2sH7dwCnnK0r0yORyfkr5ZQRUT8YCd42hUnEUlP54TDBMH9ZOpZX/nYKbv9BfFPRPP44hbYElkLtwAM02DkJX9EEW2yILGVE/roMrDlham+VNNSB7/Hrm7aUEWYwOBk9XghxOC1vhrxaG9LPZHhsKBakX/Jz1I3lWpcDf4ILa4clfej4M5gYwzMYY9P38G+MAzjnmyrjrgSvPVw8dZw9d6X4X+CRNKPXWm2UYLQHFHODkx1F4yH3aXQUy7nkCosX9SK03/kuBFo5FcARSudsYDJ9Y8SSTVtn3rTJeZF2hFww5tstZ3Ca0jTz75kaWYwvj4DpCd3AKw7/b9pw6DNCpPg07ipFI+fPjLVY+wXy1S+e8HmB6041BiMmc3dDyd4r0vuCH8a8b3Gna6/E4SyQWEv2dhEBAcKb5Eekdf8u9aSMjT7z9fVfrG7V5FQXZ+U46OgbNIUYKzQkJzO5WfRwVhbtUWlqV+YGIaBdq4V6lt0eNq5gdWSgY4pXLBOFtELbJN4wkwqeNh30vJAqmyT+SzfZxxEhire/kRAUFArql2m1aaWUEUw1rwMED8NIRryrQsBSirUFtHPSJM8NtU5/9bvZmS73prn3PTYJfKSVxD8b4c9/5O8WMWL9DxcLNRt863DT1p/RzA=,iv:dLiu9WddIz9iO3cOT7jny4PpdxiN7R/YccF/aaEy6Rc=,tag:w71GGULEaSzy0vrh4gOLvQ==,type:str]
-    #ENC[AES256_GCM,data:MQnRuJg=,iv:E82k3W8MaSx0BM7hXCkY1tN+H7D5S1kDPKmvP3Gi4/4=,tag:H4502GVmN8WvwPsiek5VpA==,type:comment]
-    NC_AUTH_JWT_SECRET: ENC[AES256_GCM,data:Js/NIpruZBw9hqvEP8cC0poEh5jf99mPd7fpDEJYsfNf5bGNN1hdXgypl8Y=,iv:aYw84L2YA4NBkICn/kP8eo345O4hEE87MwodzmlAGZk=,tag:5wyFoE9zpV9bp1ltheVHIQ==,type:str]
-    NC_ADMIN_PASSWORD: ENC[AES256_GCM,data:sKchDix8Q5VtC56G6cjT1rbO4h0/wzy+bFm9TUbhtvA=,iv:eR7nEDGn18t8hPMZK2xV26EvmrGmiWGuGFF1vgR0giA=,tag:KHLXghuZ8FE2oQ5HOkQbiQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age18e0w4jn03n66qwg8h3rjstz7g5zx2vhvz28aterkfkfetrxtpuysftp6we
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTUkJmeVlidTVPTXhJanJT
-            WmFwMXB5d0hRVFFkTnJmK2JGbmVYNWYza1JjCjNCK0xnTFViN0o3Y1FKellnelR4
-            dk9qM1A4NHgvYWZpNW1wRVFHZnVrbk0KLS0tICttWE13RVF6Y3N5RFpMenpsQmp0
-            aElkeEVMN0hnS25QamEyZGNHRkY1Q2cKxi/tu37yGgnUh5pbO3gb+aWp0P4SJZQj
-            8uW0zavu2ppT4gk/3v3u8ty8sD5rCSaBih0XM2f8+i6LdFHIzcQE6Q==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1yssdnqk90tn6zzggmwt70krndw04yfk9hwzdac3wsgfxmttngd7q89qzjr
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCb2pGSHlvKzFQdFNoQ2V6
-            ditvYXFNVllETXJIbk9ETHEraWN4Mjk5bkJRCnVyT0YySU5CTk1DUUlCazhOeWYz
-            WVpMVVIrc3BqTU41d0tkaHNTa2NoQ1EKLS0tIGRwVEJQejBDL0kwYnIyaVJVOEla
-            UmFSZEd1ekI1alFVOG1qUVNBcHFUQlUKW7idC59jIRv2NgxxwDIMAYRe9tvBI6or
-            rjkpmb3b1ONLX470pY4FtmejOw02rm7YoeFTLPSePQgeK/+7tE3P+Q==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-11-08T20:15:51Z"
-    mac: ENC[AES256_GCM,data:Hvm/nLFI9TV9r8QxLzGM/dWRTX96TFcSUlEo1Q5nWfXym3pAI8LXqtxOri8IF9aZYdo87G9u3K+IPoGHL+1rYchYRF5O9T/Dez5lm9rMBc0z3dvq3gU0HKVjNaK9bso0b7Z90VSilbb7S0ZgI8gd2Xc//jgKnRrlMTeNVVgICQ0=,iv:icFu9+L4zlFLY62J7z+/1xwkTilUh2a1ZhrkCkbWyPI=,tag:L5QgfT9w2S2N+EIugXABuQ==,type:str]
-    pgp: []
-    unencrypted_regex: ^(apiVersion|metadata|kind|type)$
-    version: 3.8.1
diff --git a/nocodb/resources/deployment.yaml b/nocodb/resources/deployment.yaml
index e7d0127..3ee6749 100644
--- a/nocodb/resources/deployment.yaml
+++ b/nocodb/resources/deployment.yaml
@@ -20,9 +20,7 @@ spec:
         image: nocodb
         envFrom:
           - secretRef:
-              name: nocodb-base-config
-          - secretRef:
-              name: nocodb-secret-config
+              name: nocodb-config
         ports:
         - containerPort: 8080
           protocol: TCP
diff --git a/nocodb/secret-generator.yaml b/nocodb/secret-generator.yaml
deleted file mode 100644
index 6823d9c..0000000
--- a/nocodb/secret-generator.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: viaduct.ai/v1
-kind: ksops
-metadata:
-  # Specify a name
-  name: nocodb-config-secret-generator
-  annotations:
-    config.kubernetes.io/function: |
-        exec:
-          path: ksops
-files:
-  - ./resources/config.enc.yaml
\ No newline at end of file