diff --git a/charts/universal-helm/Chart.yaml b/charts/universal-helm/Chart.yaml index d6f04dc..b0ba97f 100644 --- a/charts/universal-helm/Chart.yaml +++ b/charts/universal-helm/Chart.yaml @@ -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" diff --git a/charts/universal-helm/example-values.yaml b/charts/universal-helm/example-values.yaml index 67cdd6b..df15ea2 100644 --- a/charts/universal-helm/example-values.yaml +++ b/charts/universal-helm/example-values.yaml @@ -1,3 +1,4 @@ +fullnameOverride: fullname deployments: heimdall: # <- STATEFULSET_NAME # replicas: 1 @@ -250,7 +251,6 @@ deployments: port: 8545 global: - fullnameOverride: fullname serviceAccount: name: polygon securityContext: diff --git a/charts/universal-helm/templates/_helpers.tpl b/charts/universal-helm/templates/_helpers.tpl index 1c2bc38..bf81f2e 100644 --- a/charts/universal-helm/templates/_helpers.tpl +++ b/charts/universal-helm/templates/_helpers.tpl @@ -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 }} {{/* @@ -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 }} diff --git a/charts/universal-helm/values.yaml b/charts/universal-helm/values.yaml index 6d5def9..d838103 100644 --- a/charts/universal-helm/values.yaml +++ b/charts/universal-helm/values.yaml @@ -11,4 +11,4 @@ global: deployments: {} additionalManifests: [] -additionalYamlManifests: "" \ No newline at end of file +additionalYamlManifests: ""