openstack/openstack-helm-infra
Code Issues Proposed changes

Fix dependency resolver

Browse Source 
There is a condition check for dependencyKey when dependencyMixinParam
is a string value, but not when a slice value.
It requires to add an empty section in dependencies.dynamic.targeted
even if there is no dynamic dependency requirements.
This patch adds a condition check to avoid the dummy values.

Change-Id: I1db9156741959acb074d86a3ae900e8be31170f7
This commit is contained in:
root 2023-07-29 02:28:24 +10:00
parent 027bcefbd4
commit 1ab2bcfd3a
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm-toolkit/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Helm-Toolkit description: OpenStack-Helm Helm-Toolkit
name: helm-toolkit name: helm-toolkit
version: 0.2.53 version: 0.2.54
home: https://docs.openstack.org/openstack-helm home: https://docs.openstack.org/openstack-helm
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
sources: sources:

2
helm-toolkit/templates/utils/_dependency_resolver.tpl
View File

@ -27,10 +27,12 @@ limitations under the License.
{{- else if kindIs "slice" $dependencyMixinParam }} {{- else if kindIs "slice" $dependencyMixinParam }}
{{- $_ := set $envAll.Values "__deps" ( index $envAll.Values.dependencies.static $dependencyKey ) }} {{- $_ := set $envAll.Values "__deps" ( index $envAll.Values.dependencies.static $dependencyKey ) }}
{{- range $k, $v := $dependencyMixinParam -}} {{- 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 ) ) -}} {{- $_ := 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 -}} {{- $_ := set $envAll.Values "__deps" $envAll.Values.pod_dependency -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }}
{{- else -}} {{- else -}}
{{- $_ := set $envAll.Values "pod_dependency" ( index $envAll.Values.dependencies.static $dependencyKey ) -}} {{- $_ := set $envAll.Values "pod_dependency" ( index $envAll.Values.dependencies.static $dependencyKey ) -}}
{{- end -}} {{- end -}}

1
releasenotes/notes/helm-toolkit.yaml
View File

@ -60,4 +60,5 @@ helm-toolkit:
- 0.2.51 Added a random delay up to 300 seconds to remote backup upload/download for load spreading purpose - 0.2.51 Added a random delay up to 300 seconds to remote backup upload/download for load spreading purpose
- 0.2.52 Decreased random delay to up to 30 seconds and switched remote backup verification protocol to md5 - 0.2.52 Decreased random delay to up to 30 seconds and switched remote backup verification protocol to md5
- 0.2.53 Update create db user queries - 0.2.53 Update create db user queries
- 0.2.54 Fix dependency resolver to ignore non-existing dependencyKey when dependencyMixinParam is a slice
... ...