bump Octavia to 0.2.9
diff --git a/charts/octavia/Chart.yaml b/charts/octavia/Chart.yaml
index 7574543..430ed7a 100644
--- a/charts/octavia/Chart.yaml
+++ b/charts/octavia/Chart.yaml
@@ -9,4 +9,4 @@
sources:
- https://opendev.org/openstack/octavia
- https://opendev.org/openstack/openstack-helm
-version: 0.2.8
+version: 0.2.9
diff --git a/charts/octavia/charts/helm-toolkit/Chart.yaml b/charts/octavia/charts/helm-toolkit/Chart.yaml
index 7d3703e..e6aec81 100644
--- a/charts/octavia/charts/helm-toolkit/Chart.yaml
+++ b/charts/octavia/charts/helm-toolkit/Chart.yaml
@@ -9,4 +9,4 @@
sources:
- https://opendev.org/openstack/openstack-helm-infra
- https://opendev.org/openstack/openstack-helm
-version: 0.2.53
+version: 0.2.54
diff --git a/charts/octavia/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl b/charts/octavia/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl
index b99c00d..4a88dd8 100644
--- a/charts/octavia/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl
+++ b/charts/octavia/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl
@@ -27,10 +27,12 @@
{{- else if kindIs "slice" $dependencyMixinParam }}
{{- $_ := set $envAll.Values "__deps" ( index $envAll.Values.dependencies.static $dependencyKey ) }}
{{- range $k, $v := $dependencyMixinParam -}}
+{{- if ( index $envAll.Values.dependencies.dynamic.targeted $v ) }}
{{- $_ := include "helm-toolkit.utils.merge" (tuple $envAll.Values.pod_dependency $envAll.Values.__deps ( index $envAll.Values.dependencies.dynamic.targeted $v $dependencyKey ) ) -}}
{{- $_ := set $envAll.Values "__deps" $envAll.Values.pod_dependency -}}
{{- end }}
{{- end }}
+{{- end }}
{{- else -}}
{{- $_ := set $envAll.Values "pod_dependency" ( index $envAll.Values.dependencies.static $dependencyKey ) -}}
{{- end -}}
diff --git a/charts/octavia/requirements.lock b/charts/octavia/requirements.lock
index 21c23eb..c01a57e 100644
--- a/charts/octavia/requirements.lock
+++ b/charts/octavia/requirements.lock
@@ -1,6 +1,6 @@
dependencies:
- name: helm-toolkit
repository: file://../../openstack-helm-infra/helm-toolkit
- version: 0.2.53
-digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-08-03T12:05:46.285648366Z"
+ version: 0.2.54
+digest: sha256:337a0f1ffb3eae591150b305c22293d85fb8c18abec78f56672de4f3ada2faae
+generated: "2023-08-15T23:24:23.260721831Z"
diff --git a/hack/sync-charts.sh b/hack/sync-charts.sh
index 88c2b7e..9c5b56b 100755
--- a/hack/sync-charts.sh
+++ b/hack/sync-charts.sh
@@ -199,15 +199,9 @@
| filterdiff -p1 -i 'heat/*' \
| patch -p2 -d ${ATMOSPHERE}/charts/heat
-OCTAVIA_VERSION=0.2.8
+OCTAVIA_VERSION=0.2.9
curl -sL https://tarballs.opendev.org/openstack/openstack-helm/octavia-${OCTAVIA_VERSION}.tgz \
| tar -xz -C ${ATMOSPHERE}/charts
-curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~891029/revisions/1/patch?download' \
- | base64 --decode \
- | filterdiff -p1 -x 'releasenotes/*' \
- | filterdiff -p2 -x 'Chart.yaml' \
- | filterdiff -p1 -i 'octavia/*' \
- | patch -p2 -d ${ATMOSPHERE}/charts/octavia
MAGNUM_VERSION=0.2.9
curl -sL https://tarballs.opendev.org/openstack/openstack-helm/magnum-${MAGNUM_VERSION}.tgz \