Skip to content
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.

Sign up for GitHub

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

Support for Thanos v0.8.0 ; Adding query readiness probe and store readiness + health probes #948

Merged
merged 6 commits into from
Oct 15, 2019
Merged

Support for Thanos v0.8.0 ; Adding query readiness probe and store readiness + health probes #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f59790
changing to thanos v0.8.0 (image repository changed); adding health +…
Oct 10, 2019
f6cd52e
changing to thanos v0.8.0 (image repository changed); adding health +…
Oct 10, 2019
1008580
Update readme
Oct 10, 2019
605c947
Moving store readiness/liveness probe to optional (values) as store m…
Oct 11, 2019
6456fee
Updating to v0.8.1
Oct 14, 2019
52728b4
Update readme
Oct 15, 2019
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 thanos/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords:
sources:
- https://github.com/thanos-io/thanos
- https://github.com/banzaicloud/banzai-charts/tree/master/thanos
version: 0.3.5
version: 0.3.6
icon: https://raw.githubusercontent.com/thanos-io/thanos/master/website/static/Thanos-logo_full.svg
maintainers:
- name: Banzai Cloud
Expand Down
6 changes: 4 additions & 2 deletions thanos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ This section describes the values available
## General
|Name|Description| Default Value|
|----|-----------|--------------|
| image.repository | Thanos image repository and name | improbable/thanos |
| image.tag | Thanos image tag | v0.6.0 |
| image.repository | Thanos image repository and name | 'quay.io/thanos/thanos' **For Thanos version 0.6.0 or older change this to 'improbable/thanos'** |
| image.tag | Thanos image tag | v0.8.1 |
| image.pullPolicy | Image Kubernetes pull policy | IfNotPresent |
| objstore | Configuration for the backend object storage in yaml format. Mutually exclusive with objstoreFile. | {} |
| objstoreFile | Configuration for the backend object storage in string format. Mutually exclusive with objstore. | "" |
Expand Down Expand Up @@ -194,6 +194,8 @@ These values are just samples, for more fine-tuning please check the values.yaml
| store.extraEnv | Add extra environment variables | [] |
| store.extraArgs | Add extra arguments | [] |
| store.serviceAccount | Name of the Kubernetes service account to use | "" |
| store.livenessProbe | Set up liveness probe for store available for Thanos v0.8.0+) | {} |
| store.readinessProbe | Set up readinessProbe for store (available for Thanos v0.8.0+) | {} |


## Query
Expand Down
4 changes: 4 additions & 0 deletions thanos/templates/query-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ spec:
httpGet:
path: /-/healthy
port: http
readinessProbe:
httpGet:
path: /-/ready
port: http
{{- if .Values.query.certSecretName }}
volumes:
- name: {{ .Values.query.certSecretName }}
Expand Down
12 changes: 10 additions & 2 deletions thanos/templates/store-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
app.kubernetes.io/component: store
template:
metadata:
labels:
labels:
{{ with .Values.store.labels }}{{ toYaml . | indent 8 }}{{ end }}
app.kubernetes.io/name: {{ include "thanos.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
Expand Down Expand Up @@ -84,6 +84,14 @@ spec:
name: {{ .Values.store.certSecretName }}
readOnly: true
{{- end }}
{{- if .Values.store.livenessProbe }}
livenessProbe:
{{ toYaml .Values.store.livenessProbe | nindent 8 }}
{{- end }}
{{- if .Values.store.readinessProbe }}
readinessProbe:
{{ toYaml .Values.store.readinessProbe | nindent 8 }}
{{- end }}
resources:
{{ toYaml .Values.store.resources | nindent 10 }}
volumes:
Expand Down Expand Up @@ -113,4 +121,4 @@ spec:
{{- with .Values.store.serviceAccount }}
serviceAccountName: "{{ . }}"
{{- end }}
{{- end }}
{{- end }}
8 changes: 6 additions & 2 deletions thanos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: improbable/thanos
tag: v0.6.0
repository: quay.io/thanos/thanos
tag: v0.8.1
pullPolicy: IfNotPresent

store:
Expand Down Expand Up @@ -134,6 +134,10 @@ store:
# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity
affinity: {}
serviceAccount: ""
# set up store readinessProbe & livenessProbe
# Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
livenessProbe: {}
readinessProbe: {}

query:
enabled: true
Expand Down