From acba0b695f441ea33f8044b9664c1c8afa9e8630 Mon Sep 17 00:00:00 2001
From: Giovanni Tirloni <giovanni.tirloni@vexxhost.com>
Date: Tue, 9 Jul 2024 13:58:22 -0300
Subject: [PATCH] ovn: Use chart name in oci_image_registry secret

The current values.yaml uses the service name to create separate
secrets. However, helm-toolkit indexes into oci_image_registry using
.Chart.Name and not $serviceName so the secrets are not used.

Change-Id: I50f575f951c19ab728f9e40a73bc893e4f7356f2
---
 ovn/Chart.yaml              | 2 +-
 ovn/values.yaml             | 5 +----
 releasenotes/notes/ovn.yaml | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ovn/Chart.yaml b/ovn/Chart.yaml
index 67216fbc8..99dff3406 100644
--- a/ovn/Chart.yaml
+++ b/ovn/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v23.3.0
 description: OpenStack-Helm OVN
 name: ovn
-version: 0.1.11
+version: 0.1.12
 home: https://www.ovn.org
 icon: https://www.ovn.org/images/ovn-logo.png
 sources:
diff --git a/ovn/values.yaml b/ovn/values.yaml
index 8f53b4209..8c3dc5a34 100644
--- a/ovn/values.yaml
+++ b/ovn/values.yaml
@@ -197,10 +197,7 @@ pod:
 
 secrets:
   oci_image_registry:
-    ovn_ovsdb_nb: ovn-ovsdb-nb-oci-image-registry-key
-    ovn_ovsdb_sb: ovn-ovsdb-sb-oci-image-registry-key
-    ovn_northd: ovn-northd-oci-image-registry-key
-    ovn_controller: ovn-controller-oci-image-registry-key
+    ovn: ovn-oci-image-registry-key
 
 # TODO: Check these endpoints?!
 endpoints:
diff --git a/releasenotes/notes/ovn.yaml b/releasenotes/notes/ovn.yaml
index 25a568df3..c7472ce48 100644
--- a/releasenotes/notes/ovn.yaml
+++ b/releasenotes/notes/ovn.yaml
@@ -12,4 +12,5 @@ ovn:
   - 0.1.9 Make ovn db file path as configurable
   - 0.1.10 Fix typo in the controller init script
   - 0.1.11 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
+  - 0.1.12 Fix oci_image_registry secret name
 ...