From 7cc822e4eecb69764cb766a765e7c18a863322e8 Mon Sep 17 00:00:00 2001 From: Giovanni Tirloni Date: Fri, 12 Jul 2024 14:58:52 -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. Upstream: https://review.opendev.org/c/openstack/openstack-helm-infra/+/923779 --- charts/ovn/values.yaml | 6 +----- .../ovn/0003-oci-image-registry-secret.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 charts/patches/ovn/0003-oci-image-registry-secret.patch diff --git a/charts/ovn/values.yaml b/charts/ovn/values.yaml index d0f2406b8..5c35a2f57 100644 --- 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 new file mode 100644 index 000000000..904f3ab2c --- /dev/null +++ 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