From 210ed02c582172a94cacc421f608b7a002259678 Mon Sep 17 00:00:00 2001
From: kfox1111 <Kevin.Fox@pnnl.gov>
Date: Mon, 17 Apr 2023 03:18:18 -0700
Subject: [PATCH] Remove dead code (#217)

---
 charts/spire/README.md              |  2 --
 charts/spire/templates/_helpers.tpl | 35 -----------------------------
 charts/spire/values.yaml            |  3 ---
 3 files changed, 40 deletions(-)
 delete mode 100644 charts/spire/templates/_helpers.tpl

diff --git a/charts/spire/README.md b/charts/spire/README.md
index b842370..2369ede 100644
--- a/charts/spire/README.md
+++ b/charts/spire/README.md
@@ -108,12 +108,10 @@ Kubernetes: `>=1.21.0-0`
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| fullnameOverride | string | `""` |  |
 | global.k8s.clusterDomain | string | `"cluster.local"` |  |
 | global.spire.bundleConfigMap | string | `""` | Override all instances of bundleConfigMap |
 | global.spire.clusterName | string | `"example-cluster"` | Set the name of the Kubernetes cluster |
 | global.spire.trustDomain | string | `"example.org"` | Set the trust domain to use for the spiffe identifiers |
-| nameOverride | string | `""` |  |
 | spiffe-csi-driver.enabled | bool | `true` |  |
 | spiffe-oidc-discovery-provider.enabled | bool | `false` |  |
 | spire-agent.enabled | bool | `true` |  |
diff --git a/charts/spire/templates/_helpers.tpl b/charts/spire/templates/_helpers.tpl
deleted file mode 100644
index 50fe6eb..0000000
--- a/charts/spire/templates/_helpers.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "spire.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-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 "spire.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 }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "spire.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{- define "spire.server-socket-path" -}}
-{{- print "/run/spire/server-sockets/spire-server.sock" }}
-{{- end }}
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 316741b..7c028d7 100644
--- a/charts/spire/values.yaml
+++ b/charts/spire/values.yaml
@@ -20,9 +20,6 @@ global:
 #        namespace: "kube-prometheus-system"
 #        labels: {}
 
-nameOverride: ""
-fullnameOverride: ""
-
 # subcharts
 spire-server:
   enabled: true