🔥 Delete the non-existing field references in _helpers.tpl file

This commit is contained in:
M. Mert Yildiran 2023-11-02 18:53:17 +03:00
parent 19723debb2
commit bed59e12ea
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
3 changed files with 4 additions and 20 deletions

View File

@ -9,7 +9,7 @@ metadata:
{{- if .Values.tap.annotations }} {{- if .Values.tap.annotations }}
{{- toYaml .Values.tap.annotations | nindent 4 }} {{- toYaml .Values.tap.annotations | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "kubeshark.fullname" . }}-hub name: {{ include "kubeshark.name" . }}-hub
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
replicas: 1 # Set the desired number of replicas replicas: 1 # Set the desired number of replicas

View File

@ -8,7 +8,7 @@ metadata:
{{- if .Values.tap.annotations }} {{- if .Values.tap.annotations }}
{{- toYaml .Values.tap.annotations | nindent 4 }} {{- toYaml .Values.tap.annotations | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "kubeshark.fullname" . }}-front name: {{ include "kubeshark.name" . }}-front
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
replicas: 1 # Set the desired number of replicas replicas: 1 # Set the desired number of replicas

View File

@ -2,7 +2,7 @@
Expand the name of the chart. Expand the name of the chart.
*/}} */}}
{{- define "kubeshark.name" -}} {{- define "kubeshark.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- .Release.Name | trunc 63 | trimSuffix "-" }}
{{- end }} {{- end }}
{{/* {{/*
@ -11,16 +11,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. If release name contains chart name it will be used as a full name.
*/}} */}}
{{- define "kubeshark.fullname" -}} {{- define "kubeshark.fullname" -}}
{{- if .Values.fullnameOverride }} {{- printf "%s-%s" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-" }}
{{- .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 }} {{- end }}
{{/* {{/*
@ -38,9 +29,6 @@ helm.sh/chart: {{ include "kubeshark.chart" . }}
{{ include "kubeshark.selectorLabels" . }} {{ include "kubeshark.selectorLabels" . }}
app.kubernetes.io/version: {{ .Chart.Version | quote }} app.kubernetes.io/version: {{ .Chart.Version | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.additionalLabels }}
{{ toYaml . }}
{{- end }}
{{- if .Values.tap.labels }} {{- if .Values.tap.labels }}
{{ toYaml .Values.tap.labels }} {{ toYaml .Values.tap.labels }}
{{- end }} {{- end }}
@ -58,9 +46,5 @@ app.kubernetes.io/instance: {{ .Release.Name }}
Create the name of the service account to use Create the name of the service account to use
*/}} */}}
{{- define "kubeshark.serviceAccountName" -}} {{- define "kubeshark.serviceAccountName" -}}
{{- if and .Values.serviceAccount .Values.serviceAccount.create }}
{{- default (include "kubeshark.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- printf "%s-service-account" .Release.Name }} {{- printf "%s-service-account" .Release.Name }}
{{- end }} {{- end }}
{{- end }}