main: Resolved a naming conflict on templates

Author: r-casula

k8s/fn-task-controller/templates/_helpers.tpl

@@ -85,10 +85,10 @@ Create the name of the service account to use
 ghcr.io/aridhia-open-source/alpine:{{ .Values.fnalpine.tag | default "3.19" }}
 {{- end }}
 
-{{- define "pvcName" -}}
+{{- define "pvcControllerName" -}}
 {{ printf "controller-%s-pv-volclaim" (.Values.storage.capacity | default "1Gi") | lower }}
 {{- end }}
-{{- define "pvName" -}}
+{{- define "pvControllerName" -}}
 {{ printf "controller-%s-pv" (.Values.storage.capacity | default "1Gi") | lower }}
 {{- end }}
 

k8s/fn-task-controller/templates/controller-deployment.yaml

@@ -24,7 +24,7 @@ spec:
       volumes:
         - name: git
           persistentVolumeClaim:
-            claimName: {{ include "pvcName" . }}
+            claimName: {{ include "pvcControllerName" . }}
         - name: destinations
           configMap:
             name: controller-delivery-config

k8s/fn-task-controller/templates/controller-volumes.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "pvName" . }}
+  name: {{ include "pvControllerName" . }}
 spec:
   storageClassName: controller-results
   accessModes:
@@ -35,11 +35,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "pvcName" . }}
+  name: {{ include "pvcControllerName" . }}
   namespace: {{ include "controller_ns" . }}
 spec:
   storageClassName: controller-results
-  volumeName: {{ include "pvName" . }}
+  volumeName: {{ include "pvControllerName" . }}
   resources:
     requests:
       storage: {{ .Values.storage.capacity }}