fix names

pinax-network · Mar 20, 2024 · b8745a8 · b8745a8
1 parent 60bba6f
commit b8745a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/charts/substreams-sink/Chart.yaml b/charts/substreams-sink/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.10
+version: 1.0.11
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/substreams-sink/templates/_helpers.tpl b/charts/substreams-sink/templates/_helpers.tpl
@@ -9,8 +9,7 @@ Expand the name of the chart.
 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 "substreams-sink.fullname" -}}
+*/}}{{- define "substreams-sink.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else if .Values.nameOverride }}
@@ -31,7 +30,7 @@ Create chart name and version as used by the chart label.
 Create common lablels.
 */}}
 {{- define "substreams-sink.common-labels" -}}
-app: {{ .Release.Name }}
+app: {{ include "substreams-sink.fullname" . }}
 {{- if .Values.sinkType }}
 sinkType: {{ .Values.sinkType }}
 {{- end }}
@@ -65,7 +64,7 @@ Create the name of the service account to use
 */}}
 {{- define "substreams-sink.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (.Release.Name) .Values.serviceAccount.name }}
+{{- default (include "substreams-sink.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

diff --git a/charts/substreams-sink/templates/deployment.yaml b/charts/substreams-sink/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: {{ if .Values.cursorPvc.enabled }}StatefulSet{{ else }}Deployment{{ end }}
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "substreams-sink.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "substreams-sink.common-labels" . | nindent 4 }}
@@ -25,7 +25,7 @@ spec:
         - containerPort: {{ .Values.env.port }}
         envFrom:
         - configMapRef:
-            name: env-{{ .Release.Name }}
+            name: env-{{ include "substreams-sink.fullname" . }}
         {{- if .Values.secretName }}
         - secretRef:
             name: {{ .Values.secretName }}