From 33311e13cc1403a137a55af6038b47bcd92345bd Mon Sep 17 00:00:00 2001 From: Guillaume Boutry Date: Wed, 16 Sep 2026 08:29:08 +0200 Subject: [PATCH] feat: set 2026.1 default rabbitmq to 4.0 Sunbeam 2026.1 rabbitmq version is 4.0, and there should use the 4.0 channel. As per previous agreement, Sunbeam risk shall determine the rabbitmq risk, as it is a charm managed by the OpenStack team. Signed-off-by: Guillaume Boutry --- .github/workflows/test-snap.yml | 2 +- manifests/2026.1/beta.yml | 2 ++ manifests/2026.1/candidate.yml | 2 ++ manifests/2026.1/edge.yml | 2 ++ manifests/2026.1/stable.yml | 2 ++ sunbeam-python/sunbeam/versions.py | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-snap.yml b/.github/workflows/test-snap.yml index f44ec3558..1cab1c9b6 100644 --- a/.github/workflows/test-snap.yml +++ b/.github/workflows/test-snap.yml @@ -31,7 +31,7 @@ on: rabbitmq-charm-channel: description: Specify rabbitmq charms channel required: true - default: 3.12/candidate + default: 4.0/candidate type: string mysql-charm-channel: description: Specify mysql charms channel diff --git a/manifests/2026.1/beta.yml b/manifests/2026.1/beta.yml index b0fdead57..34990b455 100644 --- a/manifests/2026.1/beta.yml +++ b/manifests/2026.1/beta.yml @@ -41,6 +41,8 @@ core: channel: 2026.1/beta config: snap-channel: 2026.1/beta + rabbitmq-k8s: + channel: 4.0/beta microcluster-token-distributor: channel: latest/edge role-distributor: diff --git a/manifests/2026.1/candidate.yml b/manifests/2026.1/candidate.yml index dd68def41..938308dbc 100644 --- a/manifests/2026.1/candidate.yml +++ b/manifests/2026.1/candidate.yml @@ -41,6 +41,8 @@ core: channel: 2026.1/candidate config: snap-channel: 2026.1/candidate + rabbitmq-k8s: + channel: 4.0/candidate microcluster-token-distributor: channel: latest/edge role-distributor: diff --git a/manifests/2026.1/edge.yml b/manifests/2026.1/edge.yml index 3b786c864..dad3e484a 100644 --- a/manifests/2026.1/edge.yml +++ b/manifests/2026.1/edge.yml @@ -43,6 +43,8 @@ core: channel: 2026.1/edge config: snap-channel: 2026.1/edge + rabbitmq-k8s: + channel: 4.0/edge microcluster-token-distributor: channel: v1/stable role-distributor: diff --git a/manifests/2026.1/stable.yml b/manifests/2026.1/stable.yml index 2cfe57aa0..f5f94ac0b 100644 --- a/manifests/2026.1/stable.yml +++ b/manifests/2026.1/stable.yml @@ -43,6 +43,8 @@ core: channel: 2026.1/stable config: snap-channel: 2026.1/stable + rabbitmq-k8s: + channel: 4.0/stable microcluster-token-distributor: channel: latest/edge role-distributor: diff --git a/sunbeam-python/sunbeam/versions.py b/sunbeam-python/sunbeam/versions.py index 7fa1eb779..6c90cd13b 100644 --- a/sunbeam-python/sunbeam/versions.py +++ b/sunbeam-python/sunbeam/versions.py @@ -23,7 +23,7 @@ def determine_version() -> str: JUJU_CHANNEL = "3.6/stable" JUJU_BASE = "ubuntu@24.04" OPENSTACK_CHANNEL = f"{determine_version()}/stable" -RABBITMQ_CHANNEL = "3.12/stable" +RABBITMQ_CHANNEL = "4.0/stable" TRAEFIK_CHANNEL = "latest/stable" MICROCEPH_CHANNEL = "tentacle/stable" MICROOVN_CHANNEL = "26.03/stable"