From 504efbf49c7bca7d3676a88e61d017b2655c910f Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 28 Feb 2024 10:13:06 +0100 Subject: [PATCH 1/3] init --- deployments/values/supported-matrix.yaml | 69 ++++++++++++++++++++---- 1 file changed, 60 insertions(+), 9 deletions(-) diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml index 006c723..28bbbac 100644 --- a/deployments/values/supported-matrix.yaml +++ b/deployments/values/supported-matrix.yaml @@ -65,19 +65,19 @@ matrix: version: &acs_ga_version "23.1" pattern: *ga_hotfixes_pattern activemq: - version: "5.18" + version: &activemq_ga_version "5.18" pattern: *ga_activemq_pattern share: - version: "23.1" + version: &share_ga_version "23.1" pattern: *ga_hotfixes_pattern search: version: &search_ga_version "2.0.9" pattern: *ga_hotfixes_pattern search-enterprise: - version: "4.0" + version: &search_enterprise_ga_version "4.0" pattern: *ga_hotfixes_pattern sync: - version: "4.0" + version: &sync_ga_version "4.0" pattern: *ga_hotfixes_pattern adw: version: &adw_ga_version "4.3" @@ -86,17 +86,17 @@ matrix: version: &acc_ga_version "8.3" pattern: *ga_hotfixes_pattern onedrive: - version: "2" + version: &onedrive_ga_version "2" pattern: *ga_hotfixes_pattern msteams: - version: "2" + version: &msteams_ga_version "2" pattern: *ga_hotfixes_pattern intelligence: - version: "~3.0.0" + version: &intelligence_ga_version "~3.0.0" trouter: - version: "~4.0.0" + version: &trouter_ga_version "~4.0.0" sfs: - version: "~4.0.0" + version: &sfs_ga_version "~4.0.0" tengine-aio: version: &tengine_ga_version "~5.0.0" tengine-misc: @@ -110,6 +110,57 @@ matrix: tengine-tika: version: *tengine_ga_version + current: + id: current + acs: + version: *acs_ga_version + pattern: *ga_hotfixes_pattern + activemq: + version: *activemq_ga_version + pattern: *ga_activemq_pattern + share: + version: *share_ga_version + pattern: *ga_hotfixes_pattern + search: + version: *search_ga_version + pattern: *ga_hotfixes_pattern + search-enterprise: + version: *search_enterprise_ga_version + pattern: *ga_hotfixes_pattern + sync: + version: *sync_ga_version + pattern: *ga_hotfixes_pattern + adw: + version: *adw_ga_version + pattern: *ga_hotfixes_pattern + adminApp: + version: *acc_ga_version + pattern: *ga_hotfixes_pattern + onedrive: + version: *onedrive_ga_version + pattern: *ga_hotfixes_pattern + msteams: + version: *msteams_ga_version + pattern: *ga_hotfixes_pattern + intelligence: + version: *intelligence_ga_version + trouter: + version: *trouter_ga_version + sfs: + version: *sfs_ga_version + tengine-aio: + version: *tengine_ga_version + tengine-misc: + version: *tengine_ga_version + tengine-im: + version: *tengine_ga_version + tengine-lo: + version: *tengine_ga_version + tengine-pdf: + version: *tengine_ga_version + tengine-tika: + version: *tengine_ga_version + 7.4.N: id: 74n acs: From b15dde03d36ec42c4350bfbcacd13f1403d76f0b Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 28 Feb 2024 10:36:06 +0100 Subject: [PATCH 2/3] fix compose targets --- deployments/uber-manifest.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deployments/uber-manifest.tpl b/deployments/uber-manifest.tpl index b25e1ef..f8ff983 100644 --- a/deployments/uber-manifest.tpl +++ b/deployments/uber-manifest.tpl @@ -302,6 +302,7 @@ targets: {{- end }} {{- end }} {{- if index . "adw" }} + {{- if and .adw.compose_key .adw.compose_target }} adwCompose_{{ $id }}: name: ADW image tag kind: yaml @@ -312,6 +313,7 @@ targets: file: {{ .adw.compose_target }} key: >- {{ .adw.compose_key }} + {{- end }} adwValues_{{ $id }}: name: ADW image tag kind: yaml @@ -322,6 +324,7 @@ targets: {{ .adw.helm_key }} {{- end }} {{- if index . "aca" }} + {{- if and .aca.compose_key .aca.compose_target }} acaCompose_{{ $id }}: name: ACA image tag kind: yaml @@ -333,6 +336,7 @@ targets: key: >- {{ .aca.compose_key }} {{- end }} + {{- end }} {{- if index . "acs" }} {{- if and .acs.compose_key .acs.compose_target }} repositoryCompose_{{ $id }}: From 3b4e477a5b4ec436e099337471c3a98ba8aa04d6 Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 28 Feb 2024 13:14:59 +0100 Subject: [PATCH 3/3] add current remove 23n --- deployments/values/supported-matrix.yaml | 73 ++++-------------------- 1 file changed, 11 insertions(+), 62 deletions(-) diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml index 28bbbac..e496193 100644 --- a/deployments/values/supported-matrix.yaml +++ b/deployments/values/supported-matrix.yaml @@ -59,25 +59,25 @@ matrix: tengine-tika: version: *tengine_next_version - 23.N: - id: 23n + current: + id: current acs: version: &acs_ga_version "23.1" pattern: *ga_hotfixes_pattern activemq: - version: &activemq_ga_version "5.18" + version: "5.18" pattern: *ga_activemq_pattern share: - version: &share_ga_version "23.1" + version: "23.1" pattern: *ga_hotfixes_pattern search: version: &search_ga_version "2.0.9" pattern: *ga_hotfixes_pattern search-enterprise: - version: &search_enterprise_ga_version "4.0" + version: "4.0" pattern: *ga_hotfixes_pattern sync: - version: &sync_ga_version "4.0" + version: "4.0" pattern: *ga_hotfixes_pattern adw: version: &adw_ga_version "4.3" @@ -86,17 +86,17 @@ matrix: version: &acc_ga_version "8.3" pattern: *ga_hotfixes_pattern onedrive: - version: &onedrive_ga_version "2" + version: "2" pattern: *ga_hotfixes_pattern msteams: - version: &msteams_ga_version "2" + version: "2" pattern: *ga_hotfixes_pattern intelligence: - version: &intelligence_ga_version "~3.0.0" + version: "~3.0.0" trouter: - version: &trouter_ga_version "~4.0.0" + version: "~4.0.0" sfs: - version: &sfs_ga_version "~4.0.0" + version: "~4.0.0" tengine-aio: version: &tengine_ga_version "~5.0.0" tengine-misc: @@ -110,57 +110,6 @@ matrix: tengine-tika: version: *tengine_ga_version - current: - id: current - acs: - version: *acs_ga_version - pattern: *ga_hotfixes_pattern - activemq: - version: *activemq_ga_version - pattern: *ga_activemq_pattern - share: - version: *share_ga_version - pattern: *ga_hotfixes_pattern - search: - version: *search_ga_version - pattern: *ga_hotfixes_pattern - search-enterprise: - version: *search_enterprise_ga_version - pattern: *ga_hotfixes_pattern - sync: - version: *sync_ga_version - pattern: *ga_hotfixes_pattern - adw: - version: *adw_ga_version - pattern: *ga_hotfixes_pattern - adminApp: - version: *acc_ga_version - pattern: *ga_hotfixes_pattern - onedrive: - version: *onedrive_ga_version - pattern: *ga_hotfixes_pattern - msteams: - version: *msteams_ga_version - pattern: *ga_hotfixes_pattern - intelligence: - version: *intelligence_ga_version - trouter: - version: *trouter_ga_version - sfs: - version: *sfs_ga_version - tengine-aio: - version: *tengine_ga_version - tengine-misc: - version: *tengine_ga_version - tengine-im: - version: *tengine_ga_version - tengine-lo: - version: *tengine_ga_version - tengine-pdf: - version: *tengine_ga_version - tengine-tika: - version: *tengine_ga_version - 7.4.N: id: 74n acs: