diff --git a/.DS_Store b/.DS_Store index f6cd152..5008ddf 100644 Binary files a/.DS_Store and b/.DS_Store differ 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 @@ - - - - dc8b8e8e3d8d0c40062ef51ef2d468176c7dd00dc515d05d85018837265587ff - - - - ::/0 - - - nocodelytics - - nocodelytics - - - \ 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