From 086e51db36050f0321572010f9e936c268027d96 Mon Sep 17 00:00:00 2001 From: Alex Chapellon Date: Tue, 19 Nov 2024 16:44:10 +0100 Subject: [PATCH] OPSEXP-2890: Add ACS audit component to the supported matrix (#45) --- deployments/uber-manifest.tpl | 61 ++++++++++++++++++++---- deployments/values/supported-matrix.yaml | 4 ++ 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/deployments/uber-manifest.tpl b/deployments/uber-manifest.tpl index dadf4f4..4c5aa1f 100644 --- a/deployments/uber-manifest.tpl +++ b/deployments/uber-manifest.tpl @@ -1,10 +1,12 @@ ---- -name: Images updates for all Alfresco supported versions of Helm charts and Docker compose - +{{- define "manifest_name" }} +{{- default "Alfresco components' Updatecli manifest" .name }} +{{- end }} {{- define "quay_auth" }} username: {{ requiredEnv "QUAY_USERNAME" }} password: {{ requiredEnv "QUAY_PASSWORD" }} -{{- end }} +{{- end -}} +--- +name: {{ template "manifest_name" . }} scms: searchEnterprise: @@ -18,10 +20,10 @@ scms: token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }} directory: /tmp/updatecli/searchEnterprise -{{ $default_repo_image := "quay.io/alfresco/alfresco-content-repository" }} -{{ $default_search_image := "quay.io/alfresco/search-services" }} -{{ $default_share_image := "quay.io/alfresco/alfresco-share" }} -{{ $default_activemq_image := "quay.io/alfresco/alfresco-activemq" }} +{{- $default_repo_image := "quay.io/alfresco/alfresco-content-repository" }} +{{- $default_search_image := "quay.io/alfresco/search-services" }} +{{- $default_share_image := "quay.io/alfresco/alfresco-share" }} +{{- $default_activemq_image := "quay.io/alfresco/alfresco-activemq" }} sources: {{- range .matrix }} @@ -310,6 +312,18 @@ sources: pattern: >- ^{{ index . "activiti-admin" "version" }}{{ index . "activiti-admin" "pattern" }}$ {{- end }} + {{- with index . "audit-storage"}} + auditStorageTag_{{ $id }}: + name: Alfresco Repository Audit component image tag + kind: dockerimage + spec: + image: quay.io/alfresco/alfresco-audit-storage + {{ template "quay_auth" }} + versionFilter: + kind: semver + pattern: >- + {{ .version }} + {{- end }} {{- end }} @@ -859,4 +873,35 @@ targets: {{- end }} {{- end }} {{- end }} + {{- with index . "audit-storage" }} + {{- if and .compose_key .compose_target }} + auditStorageCompose_{{ $id }}: + name: Alfresco Repository Audit Compose target + kind: yaml + sourceid: auditStorageTag_{{ $id }} + transformers: + - addprefix: "quay.io/alfresco/alfresco-audit-storage:" + spec: + file: {{ .compose_target }} + key: {{ .compose_key }} + {{- end }} + {{- if and .helm_key .helm_target }} + auditStorageValues_{{ $id }}: + name: Alfresco Repository Audit Helm values target + kind: yaml + sourceid: auditStorageTag_{{ $id }} + spec: + file: {{ .helm_target }} + key: {{ .helm_key }} + {{- if .helm_update_appVersion }} + auditStorageAppVersion_{{ $id }}: + name: Alfresco Repository Audit Helm Chart target + kind: yaml + sourceid: auditStorageTag_{{ $id }} + spec: + file: {{ osDir .helm_target }}/Chart.yaml + key: "$.appVersion" + {{- end }} + {{- end }} + {{- end }} {{- end }} diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml index 671aff3..476d997 100644 --- a/deployments/values/supported-matrix.yaml +++ b/deployments/values/supported-matrix.yaml @@ -58,6 +58,8 @@ matrix: version: *tengine_next_version tengine-tika: version: *tengine_next_version + audit-storage: + version: ">=1.0.0-0" current: id: current @@ -118,6 +120,8 @@ matrix: activiti-admin: version: *activiti_ga_version pattern: *ga_pattern + audit-storage: + version: "~1.0.0" 7.4.N: id: 74n