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.

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

Fix blank messages in CRI & support CRI in Helm #371

Merged
merged 3 commits into from
Mar 6, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix fullnameOverride in Helm chart
Signed-off-by: Steven Sheehy <[email protected]>
Steven Sheehy committed Mar 6, 2019

Unverified

No user is associated with the committer email.
commit c366665a6766ece046cefdd3e69ba241e74e58ac
6 changes: 3 additions & 3 deletions production/helm/templates/loki/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
If release name contains chart name it will be used as a full name.
*/}}
{{- define "loki.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- if .Values.loki.fullnameOverride -}}
{{- .Values.loki.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- $name := default .Chart.Name .Values.loki.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
4 changes: 2 additions & 2 deletions production/helm/templates/promtail/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
If release name contains chart name it will be used as a full name.
*/}}
{{- define "promtail.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- if .Values.promtail.fullnameOverride -}}
{{- .Values.promtail.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.promtail.nameOverride -}}
{{- if contains $name .Release.Name -}}