From c4685837d680e5dbcd8ed9aaf9ae1680db8a9d19 Mon Sep 17 00:00:00 2001
From: Florian Herrengt <contact@florianherrengt.com>
Date: Fri, 1 Dec 2023 17:41:51 +0000
Subject: [PATCH] more cleanup

---
 .DS_Store                                     | Bin 8196 -> 6148 bytes
 .gitignore                                    |   3 ++-
 grafana.yaml                                  |   6 +-----
 kustomization/bases/clickhouse/config.xml     |  16 ----------------
 .../bases/secrets/dockerconfigjson.txt        |   2 --
 kustomization/bases/secrets/generate.sh       |   3 ---
 kustomization/bases/secrets/secrets.txt       |   3 ---
 7 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 kustomization/bases/clickhouse/config.xml
 delete mode 100644 kustomization/bases/secrets/dockerconfigjson.txt
 delete mode 100755 kustomization/bases/secrets/generate.sh
 delete mode 100644 kustomization/bases/secrets/secrets.txt

diff --git a/.DS_Store b/.DS_Store
index f6cd152d2a60b77e307a289beb4fc5fb78fbb179..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 100644
GIT binary patch
delta 105
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ516q~502;ws^0>w5KPGg_gAhnpCgF}!R
pBnTAa1`@77th%xAJM(0I8AV3M$)+;eJWLRCKt?lcj^~-f3;-`E4{!hg

literal 8196
zcmeHMU2GLa6rOL}!tC<5g@OzA!VMM0a)A~IMT_RPr9i0yp}!RLy7%r%SGK$5?%rFF
z5Np&#6E!COMH7ipdGJ9JHSl26Na6!g<AZ68n8=HXKInr#F=~RrGdp_;ZQ;R$7!r1p
znX_lke6w@Td}k+fFJlbtC99b+gE7Xb3aQVc<_bmFMV(fZxTl&V2+!Ck3t5mK3r6$q
zw9!dN5`iQFNd%GzBoRm=a6LqT&TLWmRnC2BP1+;^Nd#`l2#D`PnyQf5SdL2>eLAR#
zt^g#(6(B0~O!t5Yla6IJmg7=JP?}TT9uPwjUojxzWKWCXB(t#`mr}wRB%C3BGvXTx
zqPG(+9Svv5N}04t1d<3$kAO&@nJi!hR%FiQ_jf-}mecuB*9pR=rmvw?RoBdz$vL0J
z@9P=%$9h6DECuamai7q7ec#Pjp3Qu}V~^$Zx(?q9O~<o~5x}u*8nS=D@hpF=-7k4o
z5Mg_yfvc*T(-$2*+LTE*9m}MTu4~$`DU)t)Ue|K$n93J6tZm(sJLryh{*%%T#Ge8-
zXNp@-P4~$S${l%E_@rE@`1DQ1Csmte^!D{@IemVa7QSmVbbK%9w~GPEoIWog2fGTs
zx4UQy`#`~WOCw&8(`yT+TPV3^Xt%j;kMpn{42JgMP&^F<elhHb1`axe6@58fF9r4<
zn*dJP-a@dTZpzZ3o}9gK$+Cu(tJk$`Zri$J=fs@3^K@;#RyR;~0w?d<ePfOl4(~OC
zg6&z3cVLL3=Y`ILj$Kr1Yfh-Wo;hMq=yT`IS#*<O43_fFp^_6G(Hl6IbJZJ5Rs9s-
zZ_)ej^(}$4B8yRPEa!Zm=<g`n)XHvcg>jpzo4hw57vvO;T1M3awf7)xrG&24nz?SN
zeXg0eUD>rk+sO59b)YQcC_C@aT6rxp>R`bi8KHFtvioi$%k?w-e(~;m%plw~YI~Jc
zbr_voKg)-LVY6uO8Y4DIOo!3Md9*v!FF>7^6Z*x-_3nDZ*efP$vn<<+JvVk6d$|4;
zVRXkUJH%hwUP)u#kZqJZ5rwZI+axuWPNl_c4V^*T*?wkIejH&>v)9;h_6|GEK4zb?
zFWEWvE&Gn0XWz4**&pmr_80pb3aU_p8CZaNq_7l?SdR_Zh!$){C$?fcy08-i7{n0v
z!Nfy2h!J=w;}MMGF+7fE@Dg6eD|i)e<2}5OQ#g$?_za)p3!KM~_!Yn5cU-_fxTr8?
zfl{ZWl;z4QxooA98H1DQrDRB-lI@fk^lM#|8HcWv8L6$?wqGBaac;KAh1&TG>J}~)
z39_*@dx=JpconW)&f$o*lgJ*?HrnT@e4~t6yyRvr)knOx4^PdsN(SmP1%vs77`-g5
zrSuwNzEp2nLFx=*y;N^+Or>;%l1-{>)}}PQic(39u<IL1MXa=J(louAl1kb(-$g1D
z`7HIecA80~2><U?eV2W}K4E9s1X1+|_7nSsT?EHm)Dban#Y(I~2CIpjn{X#uBZ6)t
zdhS3sdeKi5-Ag1bz{UX#!$A=tN)b^XjfnaLp2c%`9xvcU9LMW;18?FjoWMyU?T1t7
zxMMOM@zHcTmV1hx>w5>tQX%nVP@-M42vo_L3~~SOy!!9|*X(`CL`eja2wZ;=K=qcM
zE$y_ft9@}5vZbj$KvfhmZd}R;LX8+A`lIVO$xDA2(sMetWn(!mC0VHa?>_`s$@!n0
K{}J_W=;mL~0Tp%t

diff --git a/.gitignore b/.gitignore
index 98c5478..e840253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 **/*.env
 kustomization/bases/charts
-*.tar.gz
\ No newline at end of file
+*.tar.gz
+.DS_Store
diff --git a/grafana.yaml b/grafana.yaml
index 69501fe..607c31f 100644
--- a/grafana.yaml
+++ b/grafana.yaml
@@ -63,10 +63,6 @@ spec:
             tcpSocket:
               port: 3000
             timeoutSeconds: 1
-          resources:
-            requests:
-              cpu: 250m
-              memory: 750Mi
           volumeMounts:
             - mountPath: /var/lib/grafana
               name: grafana-pv
@@ -124,7 +120,7 @@ metadata:
   namespace: sysadmin
   name: grafana-nginx-ingress
   annotations:
-    traefik.ingress.kubernetes.io/router.middlewares: default-https-redirect@kubernetescrd,default-http-auth@kubernetescrd
+    traefik.ingress.kubernetes.io/router.middlewares: default-https-redirect@kubernetescrd
 spec:
   rules:
     - host: grafana.nocodelytics.com
diff --git a/kustomization/bases/clickhouse/config.xml b/kustomization/bases/clickhouse/config.xml
deleted file mode 100644
index d0450aa..0000000
--- a/kustomization/bases/clickhouse/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<clickhouse>
-    <users>
-        <nocodelytics>
-            <password_sha256_hex>dc8b8e8e3d8d0c40062ef51ef2d468176c7dd00dc515d05d85018837265587ff</password_sha256_hex>
-
-
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>nocodelytics</profile>
-
-            <default_database>nocodelytics</default_database>
-        </nocodelytics>
-    </users>
-</clickhouse>
\ No newline at end of file
diff --git a/kustomization/bases/secrets/dockerconfigjson.txt b/kustomization/bases/secrets/dockerconfigjson.txt
deleted file mode 100644
index 3b08aed..0000000
--- a/kustomization/bases/secrets/dockerconfigjson.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# kubectl create secret docker-registry --dry-run=client regcred --docker-server=... --docker-username=... --docker-password=... -o yaml
-.dockerconfigjson=${DOCKERCONFIG_JSON}
\ No newline at end of file
diff --git a/kustomization/bases/secrets/generate.sh b/kustomization/bases/secrets/generate.sh
deleted file mode 100755
index ce3a3f0..0000000
--- a/kustomization/bases/secrets/generate.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cat ./dockerconfigjson.txt | envsubst > ./.dockerconfigjson.env
-cat ./secrets.txt | envsubst > ./.secrets.env
\ No newline at end of file
diff --git a/kustomization/bases/secrets/secrets.txt b/kustomization/bases/secrets/secrets.txt
deleted file mode 100644
index d754c05..0000000
--- a/kustomization/bases/secrets/secrets.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ENCRYPTION_KEY=$ENCRYPTION_KEY
-NATS_STAGING_PASSWORD=$NATS_STAGING_PASSWORD
-NATS_PRODUCTION_PASSWORD=$NATS_PRODUCTION_PASSWORD
\ No newline at end of file