[stable/2023.1] ovn: Use chart name in oci_image_registry secret (#1589)

This is an automated cherry-pick of #1577 /assign mnaser
vexxhost · Jul 13, 2024 · 402f755 · 402f755
1 parent 6fcc5ce
commit 402f755
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/charts/ovn/values.yaml b/charts/ovn/values.yaml
@@ -295,11 +295,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_controller_gw: ovn-controller-gw-oci-image-registry-key
+    ovn: ovn-oci-image-registry-key
 
 # TODO: Check these endpoints?!
 endpoints:

diff --git a/charts/patches/ovn/0003-oci-image-registry-secret.patch b/charts/patches/ovn/0003-oci-image-registry-secret.patch
@@ -0,0 +1,14 @@
+diff --git a/ovn/values.yaml b/ovn/values.yaml
+index 4171db47..2df5c38c 100644
+--- a/ovn/values.yaml
++++ b/ovn/values.yaml
+@@ -295,11 +295,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_controller_gw: ovn-controller-gw-oci-image-registry-key
++    ovn: ovn-oci-image-registry-key