From f77aff3cad37b287db425307e98b0fac441da0a6 Mon Sep 17 00:00:00 2001 From: Alex Chapellon Date: Wed, 8 Mar 2023 14:43:11 +0100 Subject: [PATCH] OPSEXP-1853: remove resource naming related named templates (#18) --- charts/alfresco-common/Chart.yaml | 2 +- charts/alfresco-common/README.md | 2 +- .../templates/_helpers-search.tpl | 29 ------------------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/charts/alfresco-common/Chart.yaml b/charts/alfresco-common/Chart.yaml index 81c4b7c2..07c0b175 100644 --- a/charts/alfresco-common/Chart.yaml +++ b/charts/alfresco-common/Chart.yaml @@ -5,7 +5,7 @@ description: | A helper subchart to avoid duplication in alfresco charts and set common external dependencies type: library -version: 1.0.1 +version: 2.0.0 dependencies: - name: common repository: >- diff --git a/charts/alfresco-common/README.md b/charts/alfresco-common/README.md index 38709f7e..1df52815 100644 --- a/charts/alfresco-common/README.md +++ b/charts/alfresco-common/README.md @@ -1,6 +1,6 @@ # alfresco-common -![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) +![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) A helper subchart to avoid duplication in alfresco charts and set common external dependencies diff --git a/charts/alfresco-common/templates/_helpers-search.tpl b/charts/alfresco-common/templates/_helpers-search.tpl index 87367699..7f24d8b5 100644 --- a/charts/alfresco-common/templates/_helpers-search.tpl +++ b/charts/alfresco-common/templates/_helpers-search.tpl @@ -1,32 +1,3 @@ -{{/* -Create a default fully qualified name. -*/}} -{{- define "alfresco-search.fullName" -}} -{{- printf "%s-alfresco-search" .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Alfresco Search2 Host -*/}} -{{- define "alfresco-search.host" -}} -{{- if index $.Values "alfresco-search" "enabled" -}} - {{ printf "%s-solr" (include "alfresco-search.fullName" .) -}} -{{- else -}} - {{ index $.Values "alfresco-search" "external" "host" | default "localhost" -}} -{{- end -}} -{{- end -}} - -{{/* -Get Alfresco Search Port -*/}} -{{- define "alfresco-search.port" -}} -{{- if index $.Values "alfresco-search" "enabled" -}} - {{ print (index .Values "alfresco-search" "service" "externalPort") -}} -{{- else -}} - {{ index $.Values "alfresco-search" "external" "port" | default "8983" -}} -{{- end -}} -{{- end -}} - {{/* Get Alfresco Solr context */}}