Simplify object names in tcp-server-chart

Shorten the names for the deployed objects by only including the release name: deploy/<release> ingress/<release> svc/<release>-control svc/<release>-data Signed-off-by: Han Verstraete (OpenFaaS Ltd) <han@openfaas.com>
inlets · Nov 18, 2022 · c577abc · c577abc
1 parent 699e5c3
commit c577abc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/chart/inlets-tcp-server/templates/_helpers.tpl b/chart/inlets-tcp-server/templates/_helpers.tpl
@@ -12,16 +12,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "inlets-pro.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 }}
 
 {{/*

diff --git a/chart/inlets-tcp-server/templates/control-plane-service.yaml b/chart/inlets-tcp-server/templates/control-plane-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "inlets-pro.fullname" . }}-control-plane
+  name: {{ include "inlets-pro.fullname" . }}-control
   labels:
     {{- include "inlets-pro.labels" . | nindent 4 }}
 spec:

diff --git a/chart/inlets-tcp-server/templates/data-plane-service.yaml b/chart/inlets-tcp-server/templates/data-plane-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "inlets-pro.fullname" . }}-data-plane
+  name: {{ include "inlets-pro.fullname" . }}-data
   labels:
     {{- include "inlets-pro.labels" . | nindent 4 }}
 spec:

diff --git a/chart/inlets-tcp-server/templates/ingress.yaml b/chart/inlets-tcp-server/templates/ingress.yaml
@@ -23,6 +23,6 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: {{ include "inlets-pro.fullname" . }}-control-plane
+                name: {{ include "inlets-pro.fullname" . }}-control
                 port:
                   number: {{ .Values.controlPlane.port }}
diff --git a/chart/inlets-tcp-server/values.yaml b/chart/inlets-tcp-server/values.yaml
@@ -59,4 +59,3 @@ securityContext: {}
   # runAsUser: 1000
 
 nameOverride: ""
-fullnameOverride: ""