Skip to content

Commit

Permalink
ovn: Use chart name in oci_image_registry secret (#1577)
Browse files Browse the repository at this point in the history
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
Pushing this as a patch until we have it upstream (applied with tox -e sync-charts).
  • Loading branch information
gtirloni authored Jul 12, 2024
1 parent c7fa036 commit 7df3df0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
6 changes: 1 addition & 5 deletions charts/ovn/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 14 additions & 0 deletions charts/patches/ovn/0003-oci-image-registry-secret.patch
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 7df3df0

Please sign in to comment.