Skip to content

Commit

Permalink
fullname in root
Browse files Browse the repository at this point in the history
  • Loading branch information
ManInWeb3 committed Jun 12, 2023
1 parent 8273323 commit ce451a7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion charts/universal-helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A Universal Helm chart

type: application

version: 0.0.11
version: 0.0.12
# Not compatible with 0.0.1 due to change container.command

appVersion: "1.16.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/universal-helm/example-values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
fullnameOverride: fullname
deployments:
heimdall: # <- STATEFULSET_NAME
# replicas: 1
Expand Down Expand Up @@ -250,7 +251,6 @@ deployments:
port: 8545

global:
fullnameOverride: fullname
serviceAccount:
name: polygon
securityContext:
Expand Down
6 changes: 3 additions & 3 deletions charts/universal-helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Expand the name of the chart.
*/}}
{{- define "universal-helm.name" -}}
{{- default .Chart.Name .Values.global.nameOverride | trunc 63 | trimSuffix "-" }}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Expand All @@ -11,8 +11,8 @@ 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 "universal-helm.fullname" -}}
{{- if .Values.global.fullnameOverride }}
{{- .Values.global.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
{{- $name := default .Chart.Name .Values.global.nameOverride }}
{{- if contains $name .Release.Name }}
Expand Down
2 changes: 1 addition & 1 deletion charts/universal-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ global:
deployments: {}

additionalManifests: []
additionalYamlManifests: ""
additionalYamlManifests: ""

0 comments on commit ce451a7

Please sign in to comment.