Move spire-server to dedicated subchart

Signed-off-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>

charts/spire/templates/_helpers.tpl

@@ -50,26 +50,6 @@ app.kubernetes.io/name: {{ include "spire.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Common server labels
-*/}}
-{{- define "spire.server.labels" -}}
-helm.sh/chart: {{ include "spire.chart" . }}
-{{ include "spire.server.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector server labels
-*/}}
-{{- define "spire.server.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "spire.name" . }}-server
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
 {{/*
 Common oidc labels
 */}}
@@ -112,14 +92,3 @@ Create the name of the service account to use
 {{- printf "%s/%s" .image.registry .image.repository -}}
 {{- end -}}
 {{- end }}
-
-{{- define "spire.server-upstream-ca-secret" -}}
-{{- $root := . }}
-{{- with .Values.server.config.upstreamAuthority.disk -}}
-{{- if eq (.secret.create | toString) "true" -}}
-{{ include "spire.fullname" $root }}-upstream-ca
-{{- else -}}
-{{ default (include "spire.fullname" $root) .secret.name }}
-{{- end -}}
-{{- end -}}
-{{- end }}