[kube-prometheus-stack] Pass through Thanos configuration

charts/kube-prometheus-stack/Chart.yaml

@@ -31,7 +31,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 79.0.1
+version: 80.0.0
 # renovate: github=prometheus-operator/prometheus-operator
 appVersion: v0.86.1
 kubeVersion: ">=1.25.0-0"

charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml

@@ -395,18 +395,7 @@ spec:
 {{- if not .Values.prometheus.agentMode }}
 {{- if .Values.prometheus.prometheusSpec.thanos }}
   thanos:
-{{- with (omit .Values.prometheus.prometheusSpec.thanos "objectStorageConfig" "secretProviderClass") }}
-{{ toYaml . | indent 4 }}
-{{- end }}
-{{- if ((.Values.prometheus.prometheusSpec.thanos.objectStorageConfig).existingSecret) }}
-    objectStorageConfig:
-      key: "{{.Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret.key }}"
-      name: "{{.Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret.name }}"
-{{- else if ((.Values.prometheus.prometheusSpec.thanos.objectStorageConfig).secret) }}
-    objectStorageConfig:
-      key: object-storage-configs.yaml
-      name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus
-{{- end }}
+{{ toYaml .Values.prometheus.prometheusSpec.thanos | indent 4 }}
 {{- end }}
 {{- if .Values.prometheus.prometheusSpec.disableCompaction }}
   disableCompaction: {{ .Values.prometheus.prometheusSpec.disableCompaction }}

charts/kube-prometheus-stack/values.yaml

@@ -4519,35 +4519,15 @@ prometheus:
     ##
     priorityClassName: ""
 
-    ## Thanos configuration allows configuring various aspects of a Prometheus server in a Thanos environment.
-    ## This section is experimental, it may change significantly without deprecation notice in any release.
-    ## This is experimental and may change significantly without backward compatibility in any release.
+    ## thanos object defines the configuration of the Thanos sidecar.
     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#thanosspec
     ##
     thanos: {}
-      # secretProviderClass:
-      #   provider: gcp
-      #   parameters:
-      #     secrets: |
-      #       - resourceName: "projects/$PROJECT_ID/secrets/testsecret/versions/latest"
-      #         fileName: "objstore.yaml"
       ## ObjectStorageConfig configures object storage in Thanos.
+      ##  ref: https://thanos.io/tip/thanos/storage.md/#s3
       # objectStorageConfig:
-      #   # use existing secret, if configured, objectStorageConfig.secret will not be used
-      #   existingSecret: {}
-      #     # name: ""
-      #     # key: ""
-      #   # will render objectStorageConfig secret data and configure it to be used by Thanos custom resource,
-      #   # ignored when prometheusspec.thanos.objectStorageConfig.existingSecret is set
-      #   # https://thanos.io/tip/thanos/storage.md/#s3
-      #   secret: {}
-      #     # type: S3
-      #     # config:
-      #     #   bucket: ""
-      #     #   endpoint: ""
-      #     #   region: ""
-      #     #   access_key: ""
-      #     #   secret_key: ""
+      #   name: ""
+      #   key: ""
 
     ## Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod.
     ## if using proxy extraContainer update targetPort with proxy container port