Skip to content

fix: enforcing safe release name lenghts #131

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

Draft
alix-graylog wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: enforcing safe release name lenghts #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions charts/graylog/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
Init script ConfigMap name
*/}}
{{- define "graylog.cm.init.name" }}
{{- include "graylog.fullname" . | printf "%s-init-cm" }}
{{- include "graylog.fullname" . | printf "%s-init-cm" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Expand All @@ -66,7 +66,7 @@ Service account name
{{- define "graylog.serviceAccountName" }}
{{- $defaultName := "default" }}
{{- if .Values.serviceAccount.create }}
{{- $defaultName = include "graylog.fullname" . | printf "%s-sa" }}
{{- $defaultName = include "graylog.fullname" . | printf "%s-sa" | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- .Values.serviceAccount.nameOverride | default $defaultName }}
{{- end }}
Expand All @@ -77,7 +77,7 @@ MongoDB service account name
{{- define "graylog.mongodb.serviceAccountName" }}
{{- $defaultName := "default" }}
{{- if .Values.mongodb.serviceAccount.create }}
{{- $defaultName = include "graylog.fullname" . | printf "%s-mongo-sa" }}
{{- $defaultName = include "graylog.fullname" . | printf "%s-mongo-sa" | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- .Values.mongodb.serviceAccount.nameOverride | default $defaultName }}
{{- end }}
Expand Down Expand Up @@ -195,7 +195,7 @@ Graylog secret pepper
Graylog secret name
*/}}
{{- define "graylog.secretsName" -}}
{{- $defaultName := include "graylog.fullname" . | printf "%s-secrets" }}
{{- $defaultName := include "graylog.fullname" . | printf "%s-secrets" | trunc 63 | trimSuffix "-" }}
{{- if .Values.global.existingSecretName }}
{{- $defaultName = .Values.global.existingSecretName }}
{{- end }}
Expand All @@ -206,21 +206,21 @@ Graylog secret name
Graylog Datanode secret name
*/}}
{{- define "graylog.datanode.secretsName" -}}
{{- include "graylog.secretsName" . | printf "%s-datanode" }}
{{- include "graylog.secretsName" . | printf "%s-datanode" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Graylog backup-secret name
*/}}
{{- define "graylog.backupSecretName" -}}
{{- include "graylog.fullname" . | printf "%s-backup-secret" }}
{{- include "graylog.fullname" . | printf "%s-backup-secret" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
MongoDB Community Resource name
*/}}
{{- define "graylog.mongodb.crName" -}}
{{- include "graylog.fullname" . | printf "%s-mongo-rs" }}
{{- include "graylog.fullname" . | printf "%s-mongo-rs" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Expand Down Expand Up @@ -251,7 +251,7 @@ MongoDB Community Resource Secret name
Graylog service name
*/}}
{{- define "graylog.service.name" -}}
{{- $defaultName := include "graylog.fullname" . | printf "%s-svc" }}
{{- $defaultName := include "graylog.fullname" . | printf "%s-svc" | trunc 63 | trimSuffix "-" }}
{{- .Values.graylog.service.nameOverride | default $defaultName }}
{{- end }}

Expand All @@ -266,29 +266,29 @@ Graylog service app port
Graylog configmap name
*/}}
{{- define "graylog.configmap.name" -}}
{{- include "graylog.fullname" . | printf "%s-config" }}
{{- include "graylog.fullname" . | printf "%s-config" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Graylog data PVC/volume name
*/}}
{{- define "graylog.volume.name" -}}
{{- $defaultName := include "graylog.fullname" . | printf "%s-data" }}
{{- $defaultName := include "graylog.fullname" . | printf "%s-data" | trunc 63 | trimSuffix "-" }}
{{- .Values.graylog.persistence.volumeNameOverride | default $defaultName }}
{{- end }}

{{/*
Graylog Datanode pod prefix
*/}}
{{- define "graylog.datanode.name" -}}
{{- include "graylog.fullname" . | printf "%s-datanode" }}
{{- include "graylog.fullname" . | printf "%s-datanode" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Graylog Datanode service name
*/}}
{{- define "graylog.datanode.service.name" -}}
{{- include "graylog.fullname" . | printf "%s-datanode-svc" }}
{{- include "graylog.fullname" . | printf "%s-datanode-svc" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Expand All @@ -306,15 +306,15 @@ Graylog Datanode hosts
Datanode configmap name
*/}}
{{- define "graylog.datanode.configmap.name" -}}
{{- include "graylog.fullname" . | printf "%s-datanode-config" }}
{{- include "graylog.fullname" . | printf "%s-datanode-config" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Provider-defined Storage Class name
*/}}
{{- define "graylog.provider.storageClassName" }}
{{- $names := dict }}
{{- $_ := include "graylog.fullname" . | printf "%s-gp3" | set $names "aws" -}}
{{- $_ := include "graylog.fullname" . | printf "%s-gp3" | trunc 63 | trimSuffix "-" | set $names "aws" -}}
{{/* add more entries here */}}
{{- .Values.provider | default "" | get $names }}
{{- end }}
Expand Down Expand Up @@ -498,14 +498,14 @@ Graylog Java Options
Ingress name
*/}}
{{- define "graylog.ingress.web.name" }}
{{- include "graylog.fullname" . | printf "%s-web" }}
{{- include "graylog.fullname" . | printf "%s-web" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Cert-manager issuer name
*/}}
{{- define "graylog.cert-manager.issuer.name" }}
{{- include "graylog.fullname" . | printf "%s-letsencrypt" }}
{{- include "graylog.fullname" . | printf "%s-letsencrypt" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Expand Down
4 changes: 2 additions & 2 deletions charts/graylog/templates/auth/mongo-sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- end }}
automountServiceAccountToken: {{ if eq (.Values.mongodb.serviceAccount.automount | toString) "false" }}false{{ else }}true{{ end }}
{{- if empty .Values.mongodb.serviceAccount.role.rules | not | and .Values.mongodb.serviceAccount.role.create }}
{{- $roleName := include "graylog.mongodb.serviceAccountName" . | printf "%s-role" }}
{{- $roleName := include "graylog.mongodb.serviceAccountName" . | printf "%s-role" | trunc 63 | trimSuffix "-" }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -22,7 +22,7 @@ rules: {{ .Values.mongodb.serviceAccount.role.rules | toYaml | nindent 2 }}
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "graylog.mongodb.serviceAccountName" . | printf "%s-rb" }}
name: {{ include "graylog.mongodb.serviceAccountName" . | printf "%s-rb" | trunc 63 | trimSuffix "-" }}
subjects:
- kind: ServiceAccount
name: {{ include "graylog.mongodb.serviceAccountName" . }}
Expand Down
4 changes: 2 additions & 2 deletions charts/graylog/templates/auth/sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- end }}
automountServiceAccountToken: {{ dig "automount" true .Values.serviceAccount }}
{{- if empty .Values.serviceAccount.role.rules | not | and .Values.serviceAccount.role.create }}
{{- $roleName := include "graylog.serviceAccountName" . | printf "%s-role" }}
{{- $roleName := include "graylog.serviceAccountName" . | printf "%s-role" | trunc 63 | trimSuffix "-" }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -22,7 +22,7 @@ rules: {{ .Values.serviceAccount.role.rules | toYaml | nindent 2 }}
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "graylog.serviceAccountName" . | printf "%s-rb" }}
name: {{ include "graylog.serviceAccountName" . | printf "%s-rb" | trunc 63 | trimSuffix "-" }}
subjects:
- kind: ServiceAccount
name: {{ include "graylog.serviceAccountName" . }}
Expand Down
2 changes: 1 addition & 1 deletion charts/graylog/templates/tests/test-credentials-secret.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: Secret
metadata:
name: {{ include "graylog.fullname" . }}-test-credentials
name: {{ include "graylog.fullname" . | printf "%s-test-credentials" | trunc 63 | trimSuffix "-" }}
labels:
{{- include "graylog.labels" . | nindent 4 }}
annotations:
Expand Down
6 changes: 3 additions & 3 deletions charts/graylog/templates/tests/test-datanode-registration.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: Pod
metadata:
name: {{ include "graylog.fullname" . }}-test-datanode-registration
name: {{ include "graylog.fullname" . | printf "%s-test-datanode-registration" | trunc 63 | trimSuffix "-" }} | trunc 63 | trimSuffix "-" }}
labels:
{{- include "graylog.labels" . | nindent 4 }}
annotations:
Expand Down Expand Up @@ -58,12 +58,12 @@ spec:
- name: GRAYLOG_ROOT_USERNAME
valueFrom:
secretKeyRef:
name: {{ include "graylog.fullname" . }}-test-credentials
name: {{ include "graylog.fullname" . | printf "%s-test-credentials" | trunc 63 | trimSuffix "-" }}
key: GRAYLOG_ROOT_USERNAME
- name: GRAYLOG_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "graylog.fullname" . }}-test-credentials
name: {{ include "graylog.fullname" . | printf "%s-test-credentials" | trunc 63 | trimSuffix "-" }}
key: GRAYLOG_ROOT_PASSWORD
restartPolicy: Never
{{- end }}
2 changes: 1 addition & 1 deletion charts/graylog/templates/tests/test-graylog-api-health.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: Pod
metadata:
name: {{ include "graylog.fullname" . }}-test-api-health
name: {{ include "graylog.fullname" . | printf "%s-test-api-health" | trunc 63 | trimSuffix "-" }}
labels:
{{- include "graylog.labels" . | nindent 4 }}
annotations:
Expand Down
6 changes: 3 additions & 3 deletions charts/graylog/templates/tests/test-graylog-cluster-status.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: Pod
metadata:
name: {{ include "graylog.fullname" . }}-test-cluster-status
name: {{ include "graylog.fullname" . | printf "%s-test-cluster-status" | trunc 63 | trimSuffix "-" }} | trunc 63 | trimSuffix "-" }}
labels:
{{- include "graylog.labels" . | nindent 4 }}
annotations:
Expand Down Expand Up @@ -45,12 +45,12 @@ spec:
- name: GRAYLOG_ROOT_USERNAME
valueFrom:
secretKeyRef:
name: {{ include "graylog.fullname" . }}-test-credentials
name: {{ include "graylog.fullname" . | printf "%s-test-credentials" | trunc 63 | trimSuffix "-" }}
key: GRAYLOG_ROOT_USERNAME
- name: GRAYLOG_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "graylog.fullname" . }}-test-credentials
name: {{ include "graylog.fullname" . | printf "%s-test-credentials" | trunc 63 | trimSuffix "-" }}
key: GRAYLOG_ROOT_PASSWORD
restartPolicy: Never
{{- end }}
2 changes: 1 addition & 1 deletion charts/graylog/templates/tests/test-mongodb-connectivity.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: Pod
metadata:
name: {{ include "graylog.fullname" . }}-test-mongodb
name: {{ include "graylog.fullname" . | printf "%s-test-mongodb" | trunc 63 | trimSuffix "-" }} | trunc 63 | trimSuffix "-" }}
labels:
{{- include "graylog.labels" . | nindent 4 }}
annotations:
Expand Down
Loading