Skip to content

fix: use release-specific templated names #79

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

Open
monrax wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: use release-specific templated names #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f263c8f
fix: use release-specific templated names
monrax Dec 26, 2025
c155cac
Merge branch 'main' into fix/release-specific-names
monrax Jan 8, 2026
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
15 changes: 11 additions & 4 deletions charts/graylog/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,18 @@ app.kubernetes.io/name: {{ include "graylog.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Init script ConfigMap name
*/}}
{{- define "graylog.cm.init.name" }}
{{- include "graylog.fullname" . | printf "%s-init-cm" }}
{{- end }}

{{/*
Service account name
*/}}
{{- define "graylog.serviceAccountName" -}}
{{ $defaultName := "default" }}
{{- define "graylog.serviceAccountName" }}
{{- $defaultName := "default" }}
{{- if .Values.serviceAccount.create }}
{{- $defaultName = include "graylog.fullname" . | printf "%s-sa" }}
{{- end }}
Expand All @@ -67,8 +74,8 @@ Service account name
{{/*
MongoDB service account name
*/}}
{{- define "graylog.mongodb.serviceAccountName" -}}
{{ $defaultName := "default" }}
{{- define "graylog.mongodb.serviceAccountName" }}
{{- $defaultName := "default" }}
{{- if .Values.mongodb.serviceAccount.create }}
{{- $defaultName = include "graylog.fullname" . | printf "%s-mongo-sa" }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/graylog/templates/config/init-graylog.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: init-script-cm
name: {{ include "graylog.cm.init.name" . }}
data:
init-script.sh: |
#!/bin/sh
Expand Down
2 changes: 1 addition & 1 deletion charts/graylog/templates/policy/pdb/datanode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: graylog-datanode
name: {{ include "graylog.fullname" . | printf "%s-pdb-datanode" }}
namespace: {{ .Release.Namespace }}
labels:
app: graylog-datanode
Expand Down
2 changes: 1 addition & 1 deletion charts/graylog/templates/service/ingress/graylog-forwarder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: graylog-forwarder
name: {{ include "graylog.fullname" . | printf "%s-forwarder" }}
labels:
{{- include "graylog.labels" . | nindent 4 }}
{{- with .Values.ingress.forwarder.annotations }}
Expand Down
2 changes: 1 addition & 1 deletion charts/graylog/templates/workload/statefulsets/graylog.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ spec:
volumes:
- name: init-script
configMap:
name: init-script-cm
name: {{ include "graylog.cm.init.name" . }}
defaultMode: 0755
{{- if .Values.graylog.config.tls.enabled }}
- name: tls-creds
Expand Down
Loading