From fe5de3a2c63bbc3088d727a58d0eeae9ea8a71e4 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 18 Mar 2025 09:06:58 +0100 Subject: [PATCH] ``` Update Helm charts and CI workflow for artemis-broker Modified the Helm chart names for primary and backup Artemis brokers to reflect their specific roles. The main changes include updating the name fields in the respective Chart.yaml files for artemis-broker-backup and artemis-broker-primary charts. In the CI workflow, the trigger paths in build-chart.yml were updated to include individual paths for both artemis-broker-backup and artemis-broker-primary instead of a generic artemis-broker path. This change was necessary to ensure that the CI system correctly responds to changes in both charts separately. Additionally, a dependency was added to the primary broker chart for artemis-broker-backup, underscoring their relationship in HA configuration for clustered setups. ``` --- .gitea/workflows/build-chart.yml | 3 ++- artemis-broker-backup/Chart.yaml | 2 +- artemis-broker-primary/Chart.yaml | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-chart.yml b/.gitea/workflows/build-chart.yml index fae48d5..44cff10 100644 --- a/.gitea/workflows/build-chart.yml +++ b/.gitea/workflows/build-chart.yml @@ -5,7 +5,8 @@ on: - main - dev paths: - - "artemis-broker/Chart.yaml" + - "artemis-broker-primary/Chart.yaml" + - "artemis-broker-backup/Chart.yaml" jobs: helm-package: diff --git a/artemis-broker-backup/Chart.yaml b/artemis-broker-backup/Chart.yaml index f269393..61e47b1 100644 --- a/artemis-broker-backup/Chart.yaml +++ b/artemis-broker-backup/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: artemis-broker +name: artemis-broker-backup version: 7.12.3-test2 description: An unified Helm Chart that deploys an Artemis MQ Broker with optional SSL support and Optional Disk Persistence. Clustered setups are also supported. type: application diff --git a/artemis-broker-primary/Chart.yaml b/artemis-broker-primary/Chart.yaml index f269393..a002494 100644 --- a/artemis-broker-primary/Chart.yaml +++ b/artemis-broker-primary/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: artemis-broker +name: artemis-broker-primary version: 7.12.3-test2 description: An unified Helm Chart that deploys an Artemis MQ Broker with optional SSL support and Optional Disk Persistence. Clustered setups are also supported. type: application @@ -12,3 +12,8 @@ keywords: home: https://access.redhat.com/products/red-hat-amq/ sources: - https://git.cooltux.net/marko/amq-broker-helm +dependencies: +- condition: cluster.ha_ap_mode.true + name: artemis-broker-backup + repository: https://git.cooltux.net/api/packages/marko/helm + version: 7.12.x \ No newline at end of file