From 5416f0dfcf5929e4a1f3f5fa8011cb15d6bfe045 Mon Sep 17 00:00:00 2001 From: Hemanth Nakkina Date: Wed, 1 Jul 2026 15:37:56 +0530 Subject: [PATCH] feat: move microcluster-token-distributor to v1/stable microcluster-token-distributor charm has v1/stable version. Change the default version from latest/edge to v1/stable Signed-off-by: Hemanth Nakkina --- cloud/etc/deploy-microovn/variables.tf | 2 +- manifests/2024.1/edge.yml | 2 +- manifests/2025.1/edge.yml | 2 +- manifests/2026.1/edge.yml | 2 +- sunbeam-python/sunbeam/versions.py | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cloud/etc/deploy-microovn/variables.tf b/cloud/etc/deploy-microovn/variables.tf index c3cd3ce14..42be63915 100644 --- a/cloud/etc/deploy-microovn/variables.tf +++ b/cloud/etc/deploy-microovn/variables.tf @@ -48,7 +48,7 @@ variable "openstack_network_agents_endpoint_bindings" { variable "charm_microcluster_token_distributor_channel" { description = "Operator channel for microcluster-token-distributor deployment" type = string - default = "latest/edge" + default = "v1/stable" } variable "charm_microcluster_token_distributor_revision" { diff --git a/manifests/2024.1/edge.yml b/manifests/2024.1/edge.yml index f89455692..242b3706f 100644 --- a/manifests/2024.1/edge.yml +++ b/manifests/2024.1/edge.yml @@ -50,7 +50,7 @@ core: config: snap-channel: 2024.1/edge microcluster-token-distributor: - channel: latest/edge + channel: v1/stable role-distributor: channel: latest/stable sunbeam-ovn-proxy: diff --git a/manifests/2025.1/edge.yml b/manifests/2025.1/edge.yml index 951aa0d34..787c367e8 100644 --- a/manifests/2025.1/edge.yml +++ b/manifests/2025.1/edge.yml @@ -48,7 +48,7 @@ core: config: snap-channel: 2025.1/edge microcluster-token-distributor: - channel: latest/edge + channel: v1/stable role-distributor: channel: latest/stable sunbeam-ovn-proxy: diff --git a/manifests/2026.1/edge.yml b/manifests/2026.1/edge.yml index d27dac95c..bc33533de 100644 --- a/manifests/2026.1/edge.yml +++ b/manifests/2026.1/edge.yml @@ -48,7 +48,7 @@ core: config: snap-channel: 2026.1/edge microcluster-token-distributor: - channel: latest/edge + channel: v1/stable role-distributor: channel: latest/stable sunbeam-ovn-proxy: diff --git a/sunbeam-python/sunbeam/versions.py b/sunbeam-python/sunbeam/versions.py index f5422281b..c042f1552 100644 --- a/sunbeam-python/sunbeam/versions.py +++ b/sunbeam-python/sunbeam/versions.py @@ -77,8 +77,7 @@ def determine_version() -> str: "microovn": MICROOVN_CHANNEL, "role-distributor": ROLE_DISTRIBUTOR_CHANNEL, "openstack-network-agents": OPENSTACK_CHANNEL, - # TODO: ensure correct channel for the distributor - "microcluster-token-distributor": "latest/edge", + "microcluster-token-distributor": "v1/stable", "sunbeam-ovn-proxy": OPENSTACK_CHANNEL, "k8s": K8S_CHANNEL, "openstack-hypervisor": OPENSTACK_CHANNEL,