From 213b16006447a4915e6342bdeaab566b428cbe71 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Mon, 16 Jun 2025 13:16:36 -0500
Subject: [PATCH] Update ovn system id annotation key.

This is to align with the openstack-helm-infra repo retirement.

Change-Id: I2a9c7f34dc21605f09e631938641ed69a0f37bec
---
 ovn/templates/bin/_ovn-controller-init.sh.tpl | 4 ++--
 releasenotes/notes/ovn-3e576a7be97232fe.yaml  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/ovn-3e576a7be97232fe.yaml

diff --git a/ovn/templates/bin/_ovn-controller-init.sh.tpl b/ovn/templates/bin/_ovn-controller-init.sh.tpl
index 357c069da4..2780489ba6 100644
--- a/ovn/templates/bin/_ovn-controller-init.sh.tpl
+++ b/ovn/templates/bin/_ovn-controller-init.sh.tpl
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ANNOTATION_KEY="openstack-helm-infra/ovn-system-id"
+ANNOTATION_KEY="openstack-helm/ovn-system-id"
 
 function get_ip_address_from_interface {
   local interface=$1
@@ -82,7 +82,7 @@ function get_current_system_id {
 }
 
 function get_stored_system_id {
-  kubectl get node "$NODE_NAME" -o "jsonpath={.metadata.annotations.openstack-helm-infra/ovn-system-id}"
+  kubectl get node "$NODE_NAME" -o "jsonpath={.metadata.annotations.openstack-helm/ovn-system-id}"
 }
 
 function store_system_id() {
diff --git a/releasenotes/notes/ovn-3e576a7be97232fe.yaml b/releasenotes/notes/ovn-3e576a7be97232fe.yaml
new file mode 100644
index 0000000000..a3e353a7fa
--- /dev/null
+++ b/releasenotes/notes/ovn-3e576a7be97232fe.yaml
@@ -0,0 +1,6 @@
+---
+ovn:
+  - |
+    Update system id annotation key. This is to align with the
+    openstack-helm-infra repo retirement.
+...