From 4049565148bcc99398ff5182368383e24e2c04bf Mon Sep 17 00:00:00 2001
From: auricom <github@xpander.eml.cc>
Date: Tue, 15 Jun 2021 00:33:30 +0200
Subject: [PATCH] feat: migrate thanos charts from banzaicloud to bitnami

---
 .../apps/monitoring/thanos/helm-release.yaml  | 68 +++++++++----------
 .../charts/banzaicloud-charts.yaml            | 10 ---
 cluster/base-custom/charts/kustomization.yaml |  1 -
 3 files changed, 33 insertions(+), 46 deletions(-)
 delete mode 100644 cluster/base-custom/charts/banzaicloud-charts.yaml

diff --git a/cluster/apps/monitoring/thanos/helm-release.yaml b/cluster/apps/monitoring/thanos/helm-release.yaml
index f65bd11c6..e940c1122 100644
--- a/cluster/apps/monitoring/thanos/helm-release.yaml
+++ b/cluster/apps/monitoring/thanos/helm-release.yaml
@@ -10,50 +10,48 @@ spec:
     spec:
       # renovate: registryUrl=https://kubernetes-charts.banzaicloud.com
       chart: thanos
-      version: 0.4.3
+      version: 3.17.8
       sourceRef:
         kind: HelmRepository
-        name: banzaicloud-charts
+        name: bitnami-charts
         namespace: flux-system
       interval: 5m
   values:
-    image:
-      repository: quay.io/thanos/thanos
-      tag: v0.21.1
-    sidecar:
-      enabled: true
-      selector: { app.kubernetes.io/name: prometheus }
     query:
-      http:
-        ingress:
-          enabled: true
-          annotations:
-            kubernetes.io/ingress.class: "nginx"
-            nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify"
-            nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}/"
-          hosts: ["thanos.${SECRET_CLUSTER_DOMAIN}"]
-          tls:
-            - hosts: ["thanos.${SECRET_CLUSTER_DOMAIN}"]
+      enabled: true
       replicaCount: 2
       replicaLabels:
         - replica
-    compact:
-      retentionResolution1h: 5y
-    objstore:
-      type: S3
+      dnsDiscovery:
+        sidecarsService: kube-prometheus-stack-thanos-discovery
+        sidecarsNamespace: monitoring
+      ingress:
+        enabled: true
+        hostname: "thanos.${SECRET_CLUSTER_DOMAIN}"
+        annotations:
+          kubernetes.io/ingress.class: "nginx"
+          nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify"
+          nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}/"
+        tls: true
+    queryFrontend:
+      enabled: false
+    bucketweb:
+      enabled: true
+    compactor:
+      enabled: true
+    storegateway:
+      enabled: true
+    ruler:
+      enabled: false
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+    objstoreConfig: |-
+      type: s3
       config:
-        bucket: "thanos"
-        region: "us-east-1"
+        bucket: thanos
         endpoint: ${SECRET_MINIO_ENDPOINT}
-        access_key: ${SECRET_MINIO_ACCESS_KEY}
-        secret_key: ${SECRET_MINIO_SECRET_KEY}
+        access_key: "${SECRET_MINIO_ACCESS_KEY}"
+        secret_key: "${SECRET_MINIO_SECRET_KEY}"
         insecure: false
-        signature_version2: false
-        put_user_metadata: {}
-        http_config:
-          idle_conn_timeout: 0s
-          response_header_timeout: 0s
-          insecure_skip_verify: false
-        trace:
-          enable: false
-        part_size: 0
diff --git a/cluster/base-custom/charts/banzaicloud-charts.yaml b/cluster/base-custom/charts/banzaicloud-charts.yaml
deleted file mode 100644
index 43b8cadea..000000000
--- a/cluster/base-custom/charts/banzaicloud-charts.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: banzaicloud-charts
-  namespace: flux-system
-spec:
-  interval: 10m
-  url: https://kubernetes-charts.banzaicloud.com
-  timeout: 3m
diff --git a/cluster/base-custom/charts/kustomization.yaml b/cluster/base-custom/charts/kustomization.yaml
index c08979765..05a6fdb8e 100644
--- a/cluster/base-custom/charts/kustomization.yaml
+++ b/cluster/base-custom/charts/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - banzaicloud-charts.yaml
   - bitnami-charts.yaml
   - blakeshome-charts.yaml
   - cert-manager-webhook-ovh.yaml