From 29ab610037ec988af2d194c273407911238278ee Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sat, 4 Nov 2023 12:46:47 +0100 Subject: [PATCH] Removed dependency on template chart --- argocd/vault-secrets-operator/test/Chart.lock | 7 +- argocd/vault-secrets-operator/test/Chart.yaml | 3 - .../test/templates/_helpers.tpl | 76 +++++++++++++++++++ 3 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 argocd/vault-secrets-operator/test/templates/_helpers.tpl diff --git a/argocd/vault-secrets-operator/test/Chart.lock b/argocd/vault-secrets-operator/test/Chart.lock index 39a0b4a..a634f53 100644 --- a/argocd/vault-secrets-operator/test/Chart.lock +++ b/argocd/vault-secrets-operator/test/Chart.lock @@ -2,8 +2,5 @@ dependencies: - name: vault-secrets-operator repository: https://helm.releases.hashicorp.com version: 0.3.4 -- name: template - repository: https://repo.2martens.de/charts - version: 0.2.0 -digest: sha256:e442b364d1407c67515fd5f71635c618ad782e634c5c41df157eb352509728dc -generated: "2023-11-04T12:26:32.810341+01:00" +digest: sha256:31a1abfdb72e2bbda888425b359389c93ae44e9f614e28e227181e69a0af08a7 +generated: "2023-11-04T12:45:50.219697+01:00" diff --git a/argocd/vault-secrets-operator/test/Chart.yaml b/argocd/vault-secrets-operator/test/Chart.yaml index f922d05..6102714 100644 --- a/argocd/vault-secrets-operator/test/Chart.yaml +++ b/argocd/vault-secrets-operator/test/Chart.yaml @@ -6,6 +6,3 @@ dependencies: - name: vault-secrets-operator version: 0.3.4 repository: https://helm.releases.hashicorp.com - - name: template - version: 0.2.0 - repository: https://repo.2martens.de/charts diff --git a/argocd/vault-secrets-operator/test/templates/_helpers.tpl b/argocd/vault-secrets-operator/test/templates/_helpers.tpl new file mode 100644 index 0000000..bc60ae6 --- /dev/null +++ b/argocd/vault-secrets-operator/test/templates/_helpers.tpl @@ -0,0 +1,76 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "template.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 "template.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 "template.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "template.labels" -}} +helm.sh/chart: {{ include "template.chart" . }} +{{ include "template.selectorLabels" . }} +{{- if or .Chart.AppVersion .Values.image.tag }} +app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "template.selectorLabels" -}} +app.kubernetes.io/name: {{ include "template.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "template.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "template.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} + +{{- /* +template.util.merge will merge two YAML templates and output the result. +This takes an array of three values: +- the top context +- the template name of the overrides (destination) +- the template name of the base (source) +*/}} +{{- define "template.util.merge" -}} +{{- $top := first . -}} +{{- $overrides := fromYaml (include (index . 1) $top) | default (dict ) -}} +{{- $tpl := fromYaml (include (index . 2) $top) | default (dict ) -}} +{{- toYaml (merge $overrides $tpl) -}} +{{- end -}}