Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-05 06:47:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/thanos] Fixing hashrings.json for thanos-receive component. (#5604)

Browse Source 
* Fix #5549 with that hopefully

* Bump Chart to 3.11.2

* Only create configuration for the hashring when the headless service is enabled

* Revert changes from upstream

* [bitnami/thanos] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Marcel Fest
2021-02-24 16:39:49 +01:00
committed by GitHub
parent a57b09b68f
commit 0db206ec50
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/thanos/Chart.lock
View File

@@ -1,9 +1,9 @@
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.4.0
version: 1.4.1
- name: minio
repository: https://charts.bitnami.com/bitnami
version: 6.1.10
digest: sha256:ab7aff2f4bc4c2c0b8b428791501a86366f460ee7c6b1bc15b3dac620e1caa99
generated: "2021-02-22T16:28:54.219682+01:00"
version: 6.1.11
digest: sha256:ab2523dc922e638d76a7d7af09cdfaf93a7ae9b73a6eeaa4a7c59a04b69dd10c
generated: "2021-02-24T15:12:57.801463663Z"

2
bitnami/thanos/Chart.yaml
View File

@@ -28,4 +28,4 @@ name: thanos
sources:
- https://github.com/bitnami/bitnami-docker-thanos
- https://thanos.io
version: 3.11.3
version: 3.11.4

16
bitnami/thanos/templates/_helpers.tpl
View File

@@ -274,11 +274,7 @@ Usage:
{{ include "thanos.receive.podFqdn" (dict "root" . "extra" $suffix ) }}
*/}}
{{- define "thanos.receive.podFqdn" -}}
{{- if .root.Values.receive.service.additionalHeadless -}}
{{- printf "\"%s-receive-headless-%d.%s.svc.%s:10901\"" (include "common.names.fullname" .root ) .extra .root.Release.Namespace .root.Values.clusterDomain -}}
{{- else -}}
{{- printf "\"%s-receive-%d.%s.svc.%s:10901\"" (include "common.names.fullname" .root ) .extra .root.Release.Namespace .root.Values.clusterDomain -}}
{{- end -}}
{{- printf "\"%s-receive-%d.%s-receive-headless.%s.svc.%s:10901\"" (include "common.names.fullname" .root ) .extra (include "common.names.fullname" .root ) .root.Release.Namespace .root.Values.clusterDomain -}}
{{- end -}}
{{/* Returns a proper configuration when no config is specified
@@ -287,6 +283,7 @@ Usage:
*/}}
{{- define "thanos.receive.config" -}}
{{- if not .Values.receive.config -}}
{{- if .Values.receive.service.additionalHeadless -}}
{{- $count := int .Values.receive.replicaCount -}}
{{- $endpoints_dict := dict "endpoints" (list) -}}
{{- $root := . -}}
@@ -302,6 +299,15 @@ Usage:
}
]
{{- else -}}
[
{
"endpoints": [
"127.0.0.1:10901"
]
}
]
{{- end -}}
{{- else -}}
{{- if (typeIs "string" .Values.receive.config)}}
{{- .Values.receive.config -}}
{{- else -}}

4
bitnami/thanos/templates/receive/statefulset.yaml
View File

@@ -77,10 +77,10 @@ spec:
- --label={{ .Values.receive.replicaLabel }}="$(NAME)"
- --label=receive="true"
- --tsdb.retention=15d
{{- if and (eq (int .Values.receive.replicaCount) (int 1)) .Values.receive.config }}
{{- if not .Values.receive.service.additionalHeadless }}
- --receive.local-endpoint=127.0.0.1:10901
{{- else }}
- --receive.local-endpoint=$(NAME).thanos-receive{{ if .Values.receive.service.additionalHeadless }}-headless{{ end }}.$(NAMESPACE).svc.{{ .Values.clusterDomain }}:10901
- --receive.local-endpoint=$(NAME).{{ include "common.names.fullname" . }}-receive-headless.$(NAMESPACE).svc.{{ .Values.clusterDomain }}:10901
{{- end }}
- --receive.hashrings-file=/var/lib/thanos-receive/hashrings.json
{{- if .Values.receive.extraFlags }}

6
bitnami/thanos/values.yaml
View File

@@ -18,7 +18,7 @@ kubeVersion:
image:
registry: docker.io
repository: bitnami/thanos
tag: 0.18.0-scratch-r0
tag: 0.18.0-scratch-r3
## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
##
@@ -2139,8 +2139,8 @@ volumePermissions:
##
image:
registry: docker.io
repository: bitnami/minideb
tag: buster
repository: bitnami/bitnami-shell
tag: "10"
## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
##