refactor: Reorganize template files.

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Consistent naming of behavior field
 - Made all python tests comply with mypy strict validation
 - Improved documentation about access to grafana
+- Reorganized the helm chart templates files [#352](https://github.com/developmentseed/eoapi-k8s/pull/352)
 
 ## [0.7.13] - 2025-11-04
 

charts/eoapi/README.md

@@ -159,6 +159,27 @@ For detailed configuration and usage:
 - [Data Management](https://github.com/developmentseed/eoapi-k8s/blob/main/docs/manage-data.md)
 - [Autoscaling Guide](https://github.com/developmentseed/eoapi-k8s/blob/main/docs/autoscaling.md)
 
+## Template Structure
+
+The Helm templates are organized into logical modules:
+
+```
+templates/
+├── core/           # ServiceAccount, RBAC, Knative resources
+├── database/       # PostgreSQL and pgstac bootstrap
+├── networking/     # Ingress and middleware
+├── monitoring/     # Prometheus and Grafana
+├── services/       # API deployments (stac, raster, vector, multidim)
+└── _helpers/       # Reusable template functions
+```
+
+Helper functions are organized by domain in `_helpers/`:
+- `core.tpl` - Naming, labels, service account
+- `database.tpl` - PostgreSQL configuration
+- `services.tpl` - Service helpers and init containers
+- `validation.tpl` - Chart validation
+- `_resources.tpl` - Resource presets
+
 ## License
 
 [MIT License](https://github.com/developmentseed/eoapi-k8s/blob/main/LICENSE)

charts/eoapi/templates/_helpers/core.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "eoapi.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "eoapi.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "eoapi.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "eoapi.labels" -}}
+helm.sh/chart: {{ include "eoapi.chart" . }}
+{{ include "eoapi.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "eoapi.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "eoapi.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "eoapi.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "eoapi.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

charts/eoapi/templates/_helpers.tpl → charts/eoapi/templates/_helpers/database.tpl

@@ -1,66 +1,3 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "eoapi.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "eoapi.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "eoapi.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "eoapi.labels" -}}
-helm.sh/chart: {{ include "eoapi.chart" . }}
-{{ include "eoapi.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "eoapi.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "eoapi.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "eoapi.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "eoapi.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
 {{/*
 PostgreSQL environment variables based on the configured type
 */}}
@@ -350,35 +287,6 @@ Validate PostgreSQL configuration
 {{- end }}
 {{- end }}
 
-{{/*
-values.schema.json doesn't play nice combined value checks
-so we use this helper function to check autoscaling rules
-*/}}
-{{- define "eoapi.validateAutoscaleRules" -}}
-{{- if and .Values.ingress.enabled (ne .Values.ingress.className "nginx") }}
-{{/* "requestRate" cannot be enabled for any service if not "nginx" so give feedback and fail */}}
-{{- $requestRateEnabled := false }}
-{{- range .Values.apiServices }}
-{{- if and (index $.Values . "autoscaling" "enabled") (eq (index $.Values . "autoscaling" "type") "requestRate") }}
-{{- $requestRateEnabled = true }}
-{{- end }}
-{{- end }}
-{{- if $requestRateEnabled }}
-{{- fail "When using an 'ingress.className' other than 'nginx' you cannot enable autoscaling by 'requestRate' at this time b/c it's solely an nginx metric" }}
-{{- end }}
-{{/* "both" cannot be enabled for any service if not "nginx" so give feedback and fail */}}
-{{- $bothEnabled := false }}
-{{- range .Values.apiServices }}
-{{- if and (index $.Values . "autoscaling" "enabled") (eq (index $.Values . "autoscaling" "type") "both") }}
-{{- $bothEnabled = true }}
-{{- end }}
-{{- end }}
-{{- if $bothEnabled }}
-{{- fail "When using an 'ingress.className' other than 'nginx' you cannot enable autoscaling by 'both' at this time b/c 'requestRate' is solely an nginx metric" }}
-{{- end }}
-{{- end }}
-{{- end -}}
-
 {{/*
 validate:
 1. the .Values.postgrescluster.users array does not have more than two elements.

charts/eoapi/templates/_helpers/validation.tpl

@@ -0,0 +1,28 @@
+{{/*
+values.schema.json doesn't play nice combined value checks
+so we use this helper function to check autoscaling rules
+*/}}
+{{- define "eoapi.validateAutoscaleRules" -}}
+{{- if and .Values.ingress.enabled (ne .Values.ingress.className "nginx") }}
+{{/* "requestRate" cannot be enabled for any service if not "nginx" so give feedback and fail */}}
+{{- $requestRateEnabled := false }}
+{{- range .Values.apiServices }}
+{{- if and (index $.Values . "autoscaling" "enabled") (eq (index $.Values . "autoscaling" "type") "requestRate") }}
+{{- $requestRateEnabled = true }}
+{{- end }}
+{{- end }}
+{{- if $requestRateEnabled }}
+{{- fail "When using an 'ingress.className' other than 'nginx' you cannot enable autoscaling by 'requestRate' at this time b/c it's solely an nginx metric" }}
+{{- end }}
+{{/* "both" cannot be enabled for any service if not "nginx" so give feedback and fail */}}
+{{- $bothEnabled := false }}
+{{- range .Values.apiServices }}
+{{- if and (index $.Values . "autoscaling" "enabled") (eq (index $.Values . "autoscaling" "type") "both") }}
+{{- $bothEnabled = true }}
+{{- end }}
+{{- end }}
+{{- if $bothEnabled }}
+{{- fail "When using an 'ingress.className' other than 'nginx' you cannot enable autoscaling by 'both' at this time b/c 'requestRate' is solely an nginx metric" }}
+{{- end }}
+{{- end }}
+{{- end -}}