Simplify Helm templates to use .Values.fullname directly
Some checks failed
package-helm-chart / package-helm-chart (push) Failing after 7s

- Replace complex fullname helper function with direct .Values.fullname reference
- Update all template files: ingress, deployment, service, secret, pvc, postgresql-statefulset
- Simplify serviceAccountName helper to use .Values.fullname
- This eliminates template rendering errors and makes naming more predictable
This commit is contained in:
Rebecca Valente 2025-09-23 11:16:33 -03:00
parent aecf8e2781
commit ae591d6c6c
7 changed files with 15 additions and 19 deletions

View File

@ -5,10 +5,6 @@ Expand the name of the chart.
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }} {{- end }}
{{- define "wordpress-website.fullname" -}}
{{- default .Values.fullname }}
{{- end }}
{{/* {{/*
Create chart name and version as used by the chart label. Create chart name and version as used by the chart label.
*/}} */}}
@ -41,7 +37,7 @@ Create the name of the service account to use
*/}} */}}
{{- define "wordpress-website.serviceAccountName" -}} {{- define "wordpress-website.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }} {{- if .Values.serviceAccount.create }}
{{- default (include "wordpress-website.fullname" .) .Values.serviceAccount.name }} {{- default .Values.fullname .Values.serviceAccount.name }}
{{- else }} {{- else }}
{{- default "default" .Values.serviceAccount.name }} {{- default "default" .Values.serviceAccount.name }}
{{- end }} {{- end }}

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }} name: {{ .Values.fullname }}
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
spec: spec:
@ -47,7 +47,7 @@ spec:
- name: WORDPRESS_DB_PASSWORD - name: WORDPRESS_DB_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ include "wordpress-website.fullname" . }}-postgresql name: {{ .Values.fullname }}-postgresql
key: postgresql-password key: postgresql-password
- name: WORDPRESS_TABLE_PREFIX - name: WORDPRESS_TABLE_PREFIX
value: {{ .Values.wordpress.tablePrefix }} value: {{ .Values.wordpress.tablePrefix }}
@ -103,7 +103,7 @@ spec:
volumes: volumes:
- name: wordpress-data - name: wordpress-data
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "wordpress-website.fullname" . }}-data claimName: {{ .Values.fullname }}-data
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View File

@ -2,7 +2,7 @@
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }} name: {{ .Values.fullname }}
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }} {{- with .Values.ingress.annotations }}
@ -33,7 +33,7 @@ spec:
pathType: {{ .pathType }} pathType: {{ .pathType }}
backend: backend:
service: service:
name: {{ include "wordpress-website.fullname" . }} name: {{ .Values.fullname }}
port: port:
number: {{ .Values.service.port }} number: {{ .Values.service.port }}
{{- end }} {{- end }}

View File

@ -1,12 +1,12 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }}-postgresql name: {{ .Values.fullname }}-postgresql
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
app.kubernetes.io/component: database app.kubernetes.io/component: database
spec: spec:
serviceName: {{ include "wordpress-website.fullname" . }}-postgresql serviceName: {{ .Values.fullname }}-postgresql
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
@ -36,7 +36,7 @@ spec:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ include "wordpress-website.fullname" . }}-postgresql name: {{ .Values.fullname }}-postgresql
key: postgresql-password key: postgresql-password
- name: PGDATA - name: PGDATA
value: /var/lib/postgresql/data/pgdata value: /var/lib/postgresql/data/pgdata
@ -74,12 +74,12 @@ spec:
volumes: volumes:
- name: postgresql-data - name: postgresql-data
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "wordpress-website.fullname" . }}-postgresql-data claimName: {{ .Values.fullname }}-postgresql-data
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }}-postgresql name: {{ .Values.fullname }}-postgresql
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
app.kubernetes.io/component: database app.kubernetes.io/component: database

View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }}-data name: {{ .Values.fullname }}-data
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
app.kubernetes.io/component: storage app.kubernetes.io/component: storage
@ -20,7 +20,7 @@ spec:
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }}-postgresql-data name: {{ .Values.fullname }}-postgresql-data
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
app.kubernetes.io/component: database-storage app.kubernetes.io/component: database-storage

View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }}-postgresql name: {{ .Values.fullname }}-postgresql
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
type: Opaque type: Opaque

View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ include "wordpress-website.fullname" . }} name: {{ .Values.fullname }}
labels: labels:
{{- include "wordpress-website.labels" . | nindent 4 }} {{- include "wordpress-website.labels" . | nindent 4 }}
spec: spec: