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

add optional PodDisruptionBudget to helm chart #515

Merged
merged 6 commits into from
May 9, 2019
Merged

add optional PodDisruptionBudget to helm chart #515

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5804c2b
add optional PodDisruptionBudget to helm chart
Apr 25, 2019
68697b0
address comments
May 6, 2019
b48aff8
add back new line - no change to helpers template
May 6, 2019
1df50cb
Merge branch 'master' into poddisruptionbudget
victoriaalee May 7, 2019
387aab4
Merge branch 'master' into poddisruptionbudget
victoriaalee May 9, 2019
9db630f
fix silly typo in loki-stack version
May 9, 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 production/helm/loki/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: loki
version: 0.7.0
version: 0.8.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to bump wrapper chart loki-stack as well

appVersion: 0.0.1
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
10 changes: 10 additions & 0 deletions production/helm/loki/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,13 @@ Create the name of the service account
{{- end -}}
{{- end -}}

{{/* Generate basic labels */}}
{{- define "loki.labels" }}
app: {{ template "loki.name" . }}
Copy link
Contributor

@steven-sheehy steven-sheehy Apr 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably just inline all of these in pdb.yaml unless you're going to change every resource to use loki.labels

heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
chart: {{ template "sentry-kubernetes.chart" . }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chart: {{ template "loki.chart" . }}

{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't add podLabels to non-pod resources

{{- end }}
{{- end }}
12 changes: 12 additions & 0 deletions production/helm/loki/templates/pdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{{- if .Values.podDisruptionBudget -}}
apiVersion: policy/v1beta1
kind: PodDisruptionBudget
metadata:
name: {{ template "loki.fullname" . }}
labels: {{ include "loki.defaultLabels" . | indent 4 }}
spec:
selector:
matchLabels:
app: {{ template "loki.name" . }}
{{ toYaml .Values.podDisruptionBudget | indent 2 }}
{{- end -}}
4 changes: 4 additions & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,7 @@ terminationGracePeriodSeconds: 30
## Tolerations for pod assignment
## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
tolerations: []

# The values to set in the PodDisruptionBudget spec (minAvailable/maxUnavailable)
# If not set then a PodDisruptionBudget will not be created
podDisruptionBudget:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default values should be {}. Also, add a commented out example showing maxUnavailable and minUnavailable