Skip to content

chore(chart-deps): update thanos to version 15.14.1 #2033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
fdb0900
chore(chart-deps): update thanos to version 15.14.1
svcAPLBot Apr 3, 2025
2863fb4
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 16, 2025
53a20a6
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 17, 2025
2bacc5b
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 17, 2025
c40673f
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 17, 2025
e16222b
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 17, 2025
09f7415
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 22, 2025
ce84785
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 23, 2025
3f347a1
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 24, 2025
d011338
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 24, 2025
7ab5b6b
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 25, 2025
cb1847e
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 25, 2025
48dc3c6
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 25, 2025
49d18b6
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 25, 2025
58730fe
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 28, 2025
6243f31
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 28, 2025
5c44c22
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 28, 2025
7827ad3
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 28, 2025
dd8f511
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 29, 2025
61c278f
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 29, 2025
8455d89
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 29, 2025
553ee85
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 30, 2025
41c4702
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 30, 2025
5a4b7b0
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot Apr 30, 2025
33a1a35
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 1, 2025
598ca67
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 1, 2025
a992a96
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 1, 2025
7cf0a71
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 6, 2025
7e21063
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 6, 2025
fcd3998
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 6, 2025
35bf9d4
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 7, 2025
ccd42a2
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 8, 2025
8051e71
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 8, 2025
3dfad90
Merge remote-tracking branch 'origin/main' into ci-update-thanos-to-1…
svcAPLBot May 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/chart-index/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ dependencies:
version: 1.18.5
repository: https://grafana.github.io/helm-charts
- name: thanos
version: 15.7.25
version: 15.14.1
repository: https://charts.bitnami.com/bitnami
- name: trivy-operator
version: 0.25.0
Expand Down
1,674 changes: 0 additions & 1,674 deletions charts/thanos/CHANGELOG.md

This file was deleted.

8 changes: 4 additions & 4 deletions charts/thanos/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: minio
repository: oci://registry-1.docker.io/bitnamicharts
version: 14.7.5
version: 15.0.7
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.22.0
digest: sha256:9258a3af0ed88b7900e591a497f57a543e7a6d16b81ccfb181c4ffc35aa1f1cf
generated: "2024-09-06T05:19:39.510622859Z"
version: 2.30.0
digest: sha256:f2010e653136b84d094ef082b0fd876ef9c5101146333fa6baff149b240535c4
generated: "2025-04-02T02:03:49.144320249Z"
24 changes: 14 additions & 10 deletions charts/thanos/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
# Copyright Broadcom, Inc. All Rights Reserved.
# SPDX-License-Identifier: APACHE-2.0

annotations:
category: Analytics
licenses: Apache-2.0
images: |
- name: os-shell
image: docker.io/bitnami/os-shell:12-debian-12-r29
image: docker.io/bitnami/os-shell:12-debian-12-r40
- name: thanos
image: docker.io/bitnami/thanos:0.36.1-debian-12-r2
image: docker.io/bitnami/thanos:0.37.2-debian-12-r9
licenses: Apache-2.0
tanzuCategory: application
apiVersion: v2
appVersion: 0.36.1
appVersion: 0.37.2
dependencies:
- condition: minio.enabled
name: minio
repository: oci://registry-1.docker.io/bitnamicharts
version: 15.x.x
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
tags:
- bitnami-common
version: 2.x.x
description: Thanos is a highly available metrics system that can be added on top of existing Prometheus deployments, providing a global query view across all Prometheus installations.
description: Thanos is a highly available metrics system that can be added on top
of existing Prometheus deployments, providing a global query view across all Prometheus
installations.
home: https://bitnami.com
icon: https://bitnami.com/assets/stacks/thanos/img/thanos-stack-220x234.png
icon: https://dyltqmyl993wv.cloudfront.net/assets/stacks/thanos/img/thanos-stack-220x234.png
keywords:
- analytics
- monitoring
Expand All @@ -31,4 +35,4 @@ maintainers:
name: thanos
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/thanos
version: 15.7.25
version: 15.14.1
105 changes: 85 additions & 20 deletions charts/thanos/README.md

Large diffs are not rendered by default.

596 changes: 0 additions & 596 deletions charts/thanos/charts/common/CHANGELOG.md

This file was deleted.

29 changes: 13 additions & 16 deletions charts/thanos/charts/common/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
# Copyright Broadcom, Inc. All Rights Reserved.
# SPDX-License-Identifier: APACHE-2.0

annotations:
category: Infrastructure
licenses: Apache-2.0
apiVersion: v2
# Please make sure that version and appVersion are always the same.
appVersion: 2.23.0
description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself.
appVersion: 2.30.0
description: A Library Helm Chart for grouping common logic between bitnami charts.
This chart is not deployable by itself.
home: https://bitnami.com
icon: https://bitnami.com/downloads/logos/bitnami-mark.png
icon: https://dyltqmyl993wv.cloudfront.net/downloads/logos/bitnami-mark.png
keywords:
- common
- helper
- template
- function
- bitnami
- common
- helper
- template
- function
- bitnami
maintainers:
- name: Broadcom, Inc. All Rights Reserved.
url: https://github.com/bitnami/charts
- name: Broadcom, Inc. All Rights Reserved.
url: https://github.com/bitnami/charts
name: common
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/common
- https://github.com/bitnami/charts/tree/main/bitnami/common
type: library
version: 2.23.0
version: 2.30.0
6 changes: 3 additions & 3 deletions charts/thanos/charts/common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ tag:

pullPolicy:
type: string
description: Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
description: Specify a imagePullPolicy.'

pullSecrets:
type: array
Expand Down Expand Up @@ -214,13 +214,13 @@ helm install test mychart --set path.to.value00="",path.to.value01=""

#### Useful links

- <https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-resolve-helm2-helm3-post-migration-issues-index.html>
- <https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-resolve-helm2-helm3-post-migration-issues-index.html>
- <https://helm.sh/docs/topics/v2_v3_migration/>
- <https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/>

## License

Copyright &copy; 2024 Broadcom. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
Copyright &copy; 2025 Broadcom. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
20 changes: 18 additions & 2 deletions charts/thanos/charts/common/templates/_affinities.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,14 @@ Return a topologyKey definition

{{/*
Return a soft podAffinity/podAntiAffinity definition
{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}}
{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
*/}}
{{- define "common.affinities.pods.soft" -}}
{{- $component := default "" .component -}}
{{- $customLabels := default (dict) .customLabels -}}
{{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
{{- $extraNamespaces := default (list) .extraNamespaces -}}
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
Expand All @@ -77,6 +78,13 @@ preferredDuringSchedulingIgnoredDuringExecution:
{{- range $key, $value := $extraMatchLabels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if $extraNamespaces }}
namespaces:
- {{ .context.Release.Namespace }}
{{- with $extraNamespaces }}
{{ include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
{{- end }}
{{- end }}
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
weight: 1
{{- range $extraPodAffinityTerms }}
Expand All @@ -96,13 +104,14 @@ preferredDuringSchedulingIgnoredDuringExecution:

{{/*
Return a hard podAffinity/podAntiAffinity definition
{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}}
{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
*/}}
{{- define "common.affinities.pods.hard" -}}
{{- $component := default "" .component -}}
{{- $customLabels := default (dict) .customLabels -}}
{{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
{{- $extraNamespaces := default (list) .extraNamespaces -}}
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" .context )) | nindent 8 }}
Expand All @@ -112,6 +121,13 @@ requiredDuringSchedulingIgnoredDuringExecution:
{{- range $key, $value := $extraMatchLabels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if $extraNamespaces }}
namespaces:
- {{ .context.Release.Namespace }}
{{- with $extraNamespaces }}
{{ include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
{{- end }}
{{- end }}
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
{{- range $extraPodAffinityTerms }}
- labelSelector:
Expand Down
38 changes: 31 additions & 7 deletions charts/thanos/charts/common/templates/_capabilities.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@ Return the target Kubernetes version
{{- default (default .Capabilities.KubeVersion.Version .Values.kubeVersion) ((.Values.global).kubeVersion) -}}
{{- end -}}

{{/*
Return true if the apiVersion is supported
Usage:
{{ include "common.capabilities.apiVersions.has" (dict "version" "batch/v1" "context" $) }}
*/}}
{{- define "common.capabilities.apiVersions.has" -}}
{{- $providedAPIVersions := default .context.Values.apiVersions ((.context.Values.global).apiVersions) -}}
{{- if and (empty $providedAPIVersions) (.context.Capabilities.APIVersions.Has .version) -}}
{{- true -}}
{{- else if has .version $providedAPIVersions -}}
{{- true -}}
{{- end -}}
{{- end -}}

{{/*
Return the appropriate apiVersion for poddisruptionbudget.
*/}}
Expand All @@ -36,6 +50,18 @@ Return the appropriate apiVersion for networkpolicy.
{{- end -}}
{{- end -}}

{{/*
Return the appropriate apiVersion for job.
*/}}
{{- define "common.capabilities.job.apiVersion" -}}
{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
{{- if and (not (empty $kubeVersion)) (semverCompare "<1.21-0" $kubeVersion) -}}
{{- print "batch/v1beta1" -}}
{{- else -}}
{{- print "batch/v1" -}}
{{- end -}}
{{- end -}}

{{/*
Return the appropriate apiVersion for cronjob.
*/}}
Expand Down Expand Up @@ -157,14 +183,12 @@ Return the appropriate apiVersion for Vertical Pod Autoscaler.
*/}}
{{- define "common.capabilities.vpa.apiVersion" -}}
{{- $kubeVersion := include "common.capabilities.kubeVersion" .context -}}
{{- if and (not (empty $kubeVersion)) (semverCompare "<1.23-0" $kubeVersion) -}}
{{- if .beta2 -}}
{{- print "autoscaling/v2beta2" -}}
{{- else -}}
{{- print "autoscaling/v2beta1" -}}
{{- end -}}
{{- if and (not (empty $kubeVersion)) (semverCompare "<1.11-0" $kubeVersion) -}}
{{- print "autoscaling/v1beta1" -}}
{{- else if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
{{- print "autoscaling/v1beta2" -}}
{{- else -}}
{{- print "autoscaling/v2" -}}
{{- print "autoscaling/v1" -}}
{{- end -}}
{{- end -}}

Expand Down
2 changes: 1 addition & 1 deletion charts/thanos/charts/common/templates/_compatibility.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Usage:
{{- end -}}
{{/* Remove fields that are disregarded when running the container in privileged mode */}}
{{- if $adaptedContext.privileged -}}
{{- $adaptedContext = omit $adaptedContext "capabilities" "seLinuxOptions" -}}
{{- $adaptedContext = omit $adaptedContext "capabilities" -}}
{{- end -}}
{{- omit $adaptedContext "enabled" | toYaml -}}
{{- end -}}
59 changes: 58 additions & 1 deletion charts/thanos/charts/common/templates/_errors.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SPDX-License-Identifier: APACHE-2.0

{{/* vim: set filetype=mustache: */}}
{{/*
Through error when upgrading using empty passwords values that must not be empty.
Throw error when upgrading using empty passwords values that must not be empty.

Usage:
{{- $validationError00 := include "common.validations.values.single.empty" (dict "valueKey" "path.to.password00" "secret" "secretName" "field" "password-00") -}}
Expand All @@ -26,3 +26,60 @@ Required password params:
{{- printf $errorString $validationErrors | fail -}}
{{- end -}}
{{- end -}}

{{/*
Throw error when original container images are replaced.
The error can be bypassed by setting the "global.security.allowInsecureImages" to true. In this case,
a warning message will be shown instead.

Usage:
{{ include "common.errors.insecureImages" (dict "images" (list .Values.path.to.the.imageRoot) "context" $) }}
*/}}
{{- define "common.errors.insecureImages" -}}
{{- $relocatedImages := list -}}
{{- $replacedImages := list -}}
{{- $retaggedImages := list -}}
{{- $globalRegistry := ((.context.Values.global).imageRegistry) -}}
{{- $originalImages := .context.Chart.Annotations.images -}}
{{- range .images -}}
{{- $registryName := default .registry $globalRegistry -}}
{{- $fullImageNameNoTag := printf "%s/%s" $registryName .repository -}}
{{- $fullImageName := printf "%s:%s" $fullImageNameNoTag .tag -}}
{{- if not (contains $fullImageNameNoTag $originalImages) -}}
{{- if not (contains $registryName $originalImages) -}}
{{- $relocatedImages = append $relocatedImages $fullImageName -}}
{{- else if not (contains .repository $originalImages) -}}
{{- $replacedImages = append $replacedImages $fullImageName -}}
{{- end -}}
{{- end -}}
{{- if not (contains (printf "%s:%s" .repository .tag) $originalImages) -}}
{{- $retaggedImages = append $retaggedImages $fullImageName -}}
{{- end -}}
{{- end -}}

{{- if and (or (gt (len $relocatedImages) 0) (gt (len $replacedImages) 0)) (((.context.Values.global).security).allowInsecureImages) -}}
{{- print "\n\n⚠ SECURITY WARNING: Verifying original container images was skipped. Please note this Helm chart was designed, tested, and validated on multiple platforms using a specific set of Bitnami and Tanzu Application Catalog containers. Substituting other containers is likely to cause degraded security and performance, broken chart features, and missing environment variables.\n" -}}
{{- else if (or (gt (len $relocatedImages) 0) (gt (len $replacedImages) 0)) -}}
{{- $errorString := "Original containers have been substituted for unrecognized ones. Deploying this chart with non-standard containers is likely to cause degraded security and performance, broken chart features, and missing environment variables." -}}
{{- $errorString = print $errorString "\n\nUnrecognized images:" -}}
{{- range (concat $relocatedImages $replacedImages) -}}
{{- $errorString = print $errorString "\n - " . -}}
{{- end -}}
{{- if or (contains "docker.io/bitnami/" $originalImages) (contains "docker.io/bitnamiprem/" $originalImages) -}}
{{- $errorString = print "\n\n⚠ ERROR: " $errorString -}}
{{- $errorString = print $errorString "\n\nIf you are sure you want to proceed with non-standard containers, you can skip container image verification by setting the global parameter 'global.security.allowInsecureImages' to true." -}}
{{- $errorString = print $errorString "\nFurther information can be obtained at https://github.com/bitnami/charts/issues/30850" -}}
{{- print $errorString | fail -}}
{{- else if gt (len $replacedImages) 0 -}}
{{- $errorString = print "\n\n⚠ WARNING: " $errorString -}}
{{- print $errorString -}}
{{- end -}}
{{- else if gt (len $retaggedImages) 0 -}}
{{- $warnString := "\n\n⚠ WARNING: Original containers have been retagged. Please note this Helm chart was tested, and validated on multiple platforms using a specific set of Tanzu Application Catalog containers. Substituting original image tags could cause unexpected behavior." -}}
{{- $warnString = print $warnString "\n\nRetagged images:" -}}
{{- range $retaggedImages -}}
{{- $warnString = print $warnString "\n - " . -}}
{{- end -}}
{{- print $warnString -}}
{{- end -}}
{{- end -}}
15 changes: 11 additions & 4 deletions charts/thanos/charts/common/templates/_secrets.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Params:
Generate secret password or retrieve one if already created.

Usage:
{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $) }}
{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "honorProvidedValues" false "context" $) }}

Params:
- secret - String - Required - Name of the 'Secret' resource where the password is stored.
Expand All @@ -80,12 +80,15 @@ Params:
- failOnNew - Boolean - Optional - Default to true. If set to false, skip errors adding new keys to existing secrets.
- skipB64enc - Boolean - Optional - Default to false. If set to true, no the secret will not be base64 encrypted.
- skipQuote - Boolean - Optional - Default to false. If set to true, no quotes will be added around the secret.
- honorProvidedValues - Boolean - Optional - Default to false. If set to true, the values in providedValues have higher priority than an existing secret
The order in which this function returns a secret password:
1. Already existing 'Secret' resource
1. Password provided via the values.yaml if honorProvidedValues = true
(If one of the keys passed to the 'providedValues' parameter to this function is a valid path to a key in the values.yaml and has a value, the value of the first key with a value will be returned)
2. Already existing 'Secret' resource
(If a 'Secret' resource is found under the name provided to the 'secret' parameter to this function and that 'Secret' resource contains a key with the name passed as the 'key' parameter to this function then the value of this existing secret password will be returned)
2. Password provided via the values.yaml
3. Password provided via the values.yaml if honorProvidedValues = false
(If one of the keys passed to the 'providedValues' parameter to this function is a valid path to a key in the values.yaml and has a value, the value of the first key with a value will be returned)
3. Randomly generated secret password
4. Randomly generated secret password
(A new random secret password with the length specified in the 'length' parameter will be generated and returned)

*/}}
Expand All @@ -106,6 +109,10 @@ The order in which this function returns a secret password:
{{- end -}}
{{- end }}

{{- if and $providedPasswordValue .honorProvidedValues }}
{{- $password = $providedPasswordValue | toString }}
{{- end }}

{{- if not $password }}
{{- if $providedPasswordValue }}
{{- $password = $providedPasswordValue | toString }}
Expand Down
14 changes: 14 additions & 0 deletions charts/thanos/charts/common/templates/_tplvalues.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,17 @@ Usage:
{{- end -}}
{{ $dst | toYaml }}
{{- end -}}

{{/*
Merge a list of values that contains template after rendering them.
Merge precedence is consistent with https://masterminds.github.io/sprig/dicts.html#mergeoverwrite-mustmergeoverwrite
Usage:
{{ include "common.tplvalues.merge-overwrite" ( dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $ ) }}
*/}}
{{- define "common.tplvalues.merge-overwrite" -}}
{{- $dst := dict -}}
{{- range .values -}}
{{- $dst = include "common.tplvalues.render" (dict "value" . "context" $.context "scope" $.scope) | fromYaml | mergeOverwrite $dst -}}
{{- end -}}
{{ $dst | toYaml }}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/thanos/charts/common/templates/_warnings.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Usage:

{{- if and (contains "bitnami/" .repository) (not (.tag | toString | regexFind "-r\\d+$|sha256:")) }}
WARNING: Rolling tag detected ({{ .repository }}:{{ .tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
+info https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html
+info https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html
{{- end }}
{{- end -}}

Expand Down
Loading