From 3cb55a89ea5ac51229d7177e46281e34b3299d5c Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 18 Apr 2024 09:21:41 +0200 Subject: [PATCH] support insight zeppelin appVersion --- deployments/uber-manifest.tpl | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/deployments/uber-manifest.tpl b/deployments/uber-manifest.tpl index 77db93c..3f85ad4 100644 --- a/deployments/uber-manifest.tpl +++ b/deployments/uber-manifest.tpl @@ -92,7 +92,7 @@ sources: pattern: >- ^{{ index . "acs" "version" }}{{ index . "acs" "pattern" }}$ {{- end }} - {{- if index . "insight-zeppelin" }} + {{ with index . "insight-zeppelin" }} {{ $image := "quay.io/alfresco/insight-zeppelin" }} insightZeppelinTag_{{ $id }}: name: Alfresco Insight Zeppelin @@ -105,7 +105,7 @@ sources: versionFilter: kind: regex pattern: >- - ^{{ index . "insight-zeppelin" "version" }}{{ index . "insight-zeppelin" "pattern" }}$ + ^{{ .version }}{{ .pattern }}$ {{- end }} {{- if index . "search-enterprise" }} searchEnterpriseTag_{{ $id }}: @@ -383,17 +383,27 @@ targets: key: "$.appVersion" {{- end }} {{- end }} - {{- if index . "insight-zeppelin" }} - {{- if index . "insight-zeppelin" "helm_target" }} + {{- with index . "insight-zeppelin" }} + {{ $target_insight_zeppelin_helm := .helm_target }} + {{- if $target_insight_zeppelin_helm }} insightZeppelinValues_{{ $id }}: name: Alfresco Insight Zeppelin image tag kind: yaml sourceid: insightZeppelinTag_{{ $id }} spec: - file: {{ index . "insight-zeppelin" "helm_target" }} + file: {{ $target_insight_zeppelin_helm }} key: >- {{ index . "insight-zeppelin" "helm_key" }} {{- end }} + {{- if index . "insight-zeppelin" "helm_update_appVersion" }} + insightZeppelinAppVersion_{{ $id }}: + name: Alfresco Insight Zeppelin appVersion in Chart.yaml + kind: yaml + sourceid: insightZeppelinTag_{{ $id }} + spec: + file: {{ osDir $target_insight_zeppelin_helm }}/Chart.yaml + key: "$.appVersion" + {{- end }} {{- end }} {{- if index . "search" }} {{- if and .search.compose_key .search.compose_target }}