align helpers

Author: stplasim

garage/templates/_helpers.tpl

@@ -41,12 +41,28 @@ Name of the ServiceAccount to use.
 */}}
 {{- define "garage.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "garage.fullname" .) .Values.serviceAccount.name }}
+{{- $baseName := .Values.serviceAccount.name | default (printf "sa-%s" (include "garage.fullname" .)) -}}
+{{- $baseName | trunc 63 | trimSuffix "-" }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
 
+{{/*
+Names for the ingress / HTTPRoute objects (prefixed for readability, overridable
+via .Values.<kind>.name). These name the routing object only — the backend still
+targets the Service (garage.fullname).
+*/}}
+{{- define "garage.ingressName" -}}
+{{- $baseName := .Values.ingress.name | default (printf "ingress-%s" (include "garage.fullname" .)) -}}
+{{- $baseName | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "garage.httpRouteName" -}}
+{{- $baseName := .Values.httpRoute.name | default (printf "httproute-%s" (include "garage.fullname" .)) -}}
+{{- $baseName | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
 {{/*
 Auto-generated RPC secret (inter-node clustering auth; loopback-only on a single
 node, so it is never consumed externally). `lookup` reuses the previously stored

garage/templates/httproute.yaml

@@ -9,7 +9,7 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: {{ $fullName }}
+  name: {{ include "garage.httpRouteName" . }}
   labels:
     {{- include "garage.labels" . | nindent 4 }}
     {{- with .Values.httpRoute.labels }}

garage/templates/ingress.yaml

@@ -4,7 +4,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ include "garage.ingressName" . }}
   labels:
     {{- include "garage.labels" . | nindent 4 }}
     {{- with .Values.ingress.labels }}

garage/values.reference.yaml

@@ -94,6 +94,8 @@ service:
 ingress:
   # -- Enable the Ingress.
   enabled: false
+  # -- Name of the Ingress object. Defaults to ingress-<fullname> when empty.
+  name: ""
   # -- Ingress class name.
   className: ""
   # -- Ingress annotations.

garage/values.yaml

@@ -38,6 +38,7 @@ service:
 
 ingress:
   enabled: false
+  name: ""
   className: ""
   annotations: {}
   labels: {}
@@ -50,6 +51,7 @@ ingress:
 
 httpRoute:
   enabled: false
+  name: ""
   parentRefs: []
   hostnames: []
   annotations: {}