datalake-metrics: cleanup

thaum-xyz · Nov 16, 2024 · b198c0a · b198c0a
1 parent f9f37b5
commit b198c0a
Show file tree

Hide file tree

Showing 20 changed files with 208 additions and 1,131 deletions.
diff --git a/apps/datalake-metrics/Makefile b/apps/datalake-metrics/Makefile
diff --git a/...etrics/manifests/custom/bucketConfig.yaml → apps/datalake-metrics/bucket-config.yaml b/...etrics/manifests/custom/bucketConfig.yaml → apps/datalake-metrics/bucket-config.yaml
@@ -27,12 +27,3 @@ spec:
             secret_key: {{ .secret_key }}
             insecure: true
           prefix: thanos
-        thanos.yaml: |
-          type: S3
-          config:
-            bucket: metrics
-            endpoint: main-minio.minio.svc:9000
-            access_key: {{ .access_key }}
-            secret_key: {{ .secret_key }}
-            insecure: true
-          prefix: thanos
diff --git a/...ests/custom/thanosReceiveIngressAuth.yaml → apps/datalake-metrics/ingress-auth.yaml b/...ests/custom/thanosReceiveIngressAuth.yaml → apps/datalake-metrics/ingress-auth.yaml
diff --git a/...rics/manifests/custom/middlewareAuth.yaml → ...lake-metrics/ingress-middleware-auth.yaml b/...rics/manifests/custom/middlewareAuth.yaml → ...lake-metrics/ingress-middleware-auth.yaml
diff --git a/...ake-metrics/manifests/custom/ingress.yaml → apps/datalake-metrics/ingress.yaml b/...ake-metrics/manifests/custom/ingress.yaml → apps/datalake-metrics/ingress.yaml
diff --git a/apps/datalake-metrics/jsonnet/jsonnetfile.json b/apps/datalake-metrics/jsonnet/jsonnetfile.json
diff --git a/apps/datalake-metrics/jsonnet/jsonnetfile.lock.json b/apps/datalake-metrics/jsonnet/jsonnetfile.lock.json
diff --git a/apps/datalake-metrics/jsonnet/main.jsonnet b/apps/datalake-metrics/jsonnet/main.jsonnet
diff --git a/apps/datalake-metrics/kustomization.yaml b/apps/datalake-metrics/kustomization.yaml
@@ -0,0 +1,19 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: minio
+resources:
+  - repository.yaml
+  - release.yaml
+  - bucket-config.yaml
+  - ingress.yaml
+  - ingress-middleware-auth.yaml
+  - ingress-auth.yaml
+  - prometheus-rules.yaml
+  - slo-receive-errors.yaml
+  - slo-receive-latency.yaml
+configMapGenerator:
+  - name: values
+    files:
+      - values.yaml=values.yaml
+configurations:
+  - kustomizeconfig.yaml
diff --git a/apps/datalake-metrics/kustomizeconfig.yaml b/apps/datalake-metrics/kustomizeconfig.yaml
@@ -0,0 +1,8 @@
+# Kustomize config for enabling HelmRelease values from
+# ConfigMaps and Secrets generated by Kustomize
+nameReference:
+- kind: ConfigMap
+  version: v1
+  fieldSpecs:
+  - path: spec/valuesFrom/name
+    kind: HelmRelease
diff --git a/apps/datalake-metrics/manifests/custom/hashring.yaml b/apps/datalake-metrics/manifests/custom/hashring.yaml