apps-sc: expose thanos receiveDistributor configs

elastisys · Jan 30, 2025 · 7b9cad4 · 7b9cad4
1 parent 3d5ccdd
commit 7b9cad4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/changelog/0.43.md b/changelog/0.43.md
@@ -4,7 +4,6 @@ Released 2025-01-20
 
 > [!WARNING]
 > **Security Notice(s)**
-> - Upgrades Grafana to `11.3.0` to fix CVE-2024-9264
 > - OpenSearch Dashboards was upgraded to `2.17.1` which mitigates [CVE-2024-45801](https://github.com/advisories/GHSA-mmhx-hmjr-r674)
 <!-- -->
 > [!IMPORTANT]
@@ -33,7 +32,6 @@ Released 2025-01-20
 - [#2310](https://github.com/elastisys/compliantkubernetes-apps/pull/2310) - config: move harbor backup schedule and make it configurable @viktor-f
 - [#2317](https://github.com/elastisys/compliantkubernetes-apps/pull/2317) - apps: Change default for external traffic policy to local @Xartos
   - Default external traffic policy is now set to `local`. If your infrastructure doesn't support this, please set `.externalTrafficPolicy.local` to false.
-- [#2319](https://github.com/elastisys/compliantkubernetes-apps/pull/2319) - Upgrade Grafana to 11.3.0 and chart to 8.5.9 to fix CVE-2024-9264 @anders-elastisys
 - [#2324](https://github.com/elastisys/compliantkubernetes-apps/pull/2324) - Delete admin-rbac last in clean scripts @anders-elastisys
 - [#2331](https://github.com/elastisys/compliantkubernetes-apps/pull/2331) - apps sc: add falco exception for tekton cleanup @lunkan93
 - [#2336](https://github.com/elastisys/compliantkubernetes-apps/pull/2336) - scripts: Fixed idempotency for clean wc script @Xartos

diff --git a/config/sc-config.yaml b/config/sc-config.yaml
@@ -575,14 +575,15 @@ thanos:
     # It needs to write to (REPLICATION_FACTOR + 1)/2 nodes for success.
     # For more info: https://thanos.io/v0.24/proposals-done/201812-thanos-remote-receive.md/#replication
     replicationFactor: 1
-
+    replicaCount: 1
     resources:
       requests:
         cpu: 150m
         memory: 100Mi
       limits:
         cpu: 1000m
         memory: 1Gi
+    extraFlags: [] #use extraflags when you want to add more command line flags to the component.
 
   ruler:
     # Enables the ruler component

diff --git a/config/schemas/config.yaml b/config/schemas/config.yaml
@@ -4873,6 +4873,15 @@ properties:
         type: object
         additionalProperties: false
         properties:
+          replicaCount:
+            title: Thanos receiveDistributor Replicas
+            type: integer
+            default: 1
+          extraFlags:
+            title: Thanos receiveDistributor extraFlags
+            description: |-
+              When set, the arguments will be passed onto the component as command-line flags. Refer to the [upstream doc](https://github.com/bitnami/charts/blob/main/bitnami/thanos/README.md#adding-extra-flags) for more details.
+            type: array
           replicationFactor:
             title: Thanos Replication Factor
             description: Requires that incoming remote write requests are replicated `(replicationFactor + 1) / 2`.

diff --git a/helmfile.d/values/thanos/receiver.yaml.gotmpl b/helmfile.d/values/thanos/receiver.yaml.gotmpl
@@ -130,13 +130,18 @@ receiveDistributor:
 
   resources: {{- toYaml .Values.thanos.receiveDistributor.resources | nindent 4 }}
   replicationFactor: {{  .Values.thanos.receiveDistributor.replicationFactor }}
+  replicaCount: {{ .Values.thanos.receiveDistributor.replicaCount }}
 
   containerSecurityContext:
     capabilities:
       drop:
         - ALL
     seccompProfile:
       type: RuntimeDefault
+  {{- if .Values.thanos.receiveDistributor.extraFlags }}
+  extraFlags:
+    {{- toYaml .Values.thanos.receiveDistributor.extraFlags | nindent 4 }}
+  {{ end }}
 
 ruler:
   networkPolicy: