OPSEXP-2242: alfresco-common template fix to allow jdbc prefix in JDB…

…C url (#117)
Alfresco · Sep 25, 2023 · 71a3ab7 · 71a3ab7
1 parent 498b386
commit 71a3ab7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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: 3.0.0-alpha.1
+version: 3.0.0-alpha.2
 dependencies:
   - name: common
     repository: oci://registry-1.docker.io/bitnamicharts

diff --git a/charts/alfresco-common/README.md b/charts/alfresco-common/README.md
@@ -1,6 +1,6 @@
 # alfresco-common
 
-![Version: 3.0.0-alpha.1](https://img.shields.io/badge/Version-3.0.0--alpha.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 3.0.0-alpha.2](https://img.shields.io/badge/Version-3.0.0--alpha.2-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-jdbc.tpl b/charts/alfresco-common/templates/_helpers-jdbc.tpl
@@ -9,7 +9,7 @@ Usage: include "alfresco-common.jdbc.parser" "URL"
 {{- define "alfresco-common.jdbc.parser" -}}
 {{- $jdbc_url := required "Alfresco repository needs a database to start. Please provide a valid URL in db.url value" . }}
 {{- if hasPrefix "jdbc:" $jdbc_url }}
-{{- fail "database URL MUST be provided WITHOUT the 'jdbc' prefix." }}
+{{- $jdbc_url = trimPrefix "jdbc:" $jdbc_url }}
 {{- end }}
 {{- if hasPrefix "oracle:thin:@" $jdbc_url }}
   {{- $ora_url := trimPrefix "oracle:thin:" $jdbc_url }}