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

Jump to bottom

Helm: Fix the reference error of loki/loki helm chart #1056

Merged
merged 4 commits into from
Oct 24, 2019
Merged

Helm: Fix the reference error of loki/loki helm chart #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a91141
fix a reference error of loki/loki helm chart
polar3130 Sep 25, 2019
d99ae51
bump loki-stack chart
cyriltovena Oct 24, 2019
99ee67f
Merge branch 'master' into fix-loki-helm-chart
cyriltovena Oct 24, 2019
83d6a27
Add missing chart version
cyriltovena Oct 24, 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
1 change: 1 addition & 0 deletions production/helm/fluent-bit/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
apiVersion: "v1"
name: fluent-bit
version: 0.0.2
appVersion: v0.0.1
Expand Down
3 changes: 2 additions & 1 deletion production/helm/loki-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apiVersion: "v1"
name: loki-stack
version: 0.17.3
version: 0.17.4
appVersion: v0.3.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
3 changes: 2 additions & 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,6 @@
apiVersion: "v1"
name: loki
version: 0.16.0
version: 0.16.1
appVersion: v0.3.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
18 changes: 18 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 @@ -41,3 +41,21 @@ Create the name of the service account
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

{{/*
Create the app name of loki clients. Defaults to the same logic as "loki.fullname", and default client expects "promtail".
*/}}
{{- define "client.name" -}}
{{- if .Values.client.name -}}
{{- .Values.client.name -}}
{{- else if .Values.client.fullnameOverride -}}
{{- .Values.client.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default "promtail" .Values.client.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion production/helm/loki/templates/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
- from:
- podSelector:
matchLabels:
app: {{ template "promtail.name" . }}
app: {{ template "client.name" . }}
release: {{ .Release.Name }}
- ports:
- port: {{ .Values.service.port }}
Expand Down
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 @@ -84,6 +84,10 @@ livenessProbe:
networkPolicy:
enabled: false

## The app name of loki clients
client: {}
# name:

## ref: https://kubernetes.io/docs/user-guide/node-selection/
nodeSelector: {}

Expand Down
1 change: 1 addition & 0 deletions production/helm/promtail/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
apiVersion: "v1"
name: promtail
version: 0.12.3
appVersion: v0.3.0
Expand Down