Merge "Keystone: Fix error - wrong number of args for set"

keystone/Chart.yaml

@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.1.12
+version: 0.1.13
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:

keystone/templates/job-db-init.yaml

@@ -18,9 +18,9 @@ helm.sh/hook-weight: "-5"
 {{- end }}
 
 {{- if .Values.manifests.job_db_init }}
-{{- $dbInitJob := dict "envAll" . "serviceName" "keystone" -}}
+{{- $dbInitJob := dict "envAll" . "serviceName" "keystone" "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}}
 {{- if .Values.manifests.certificates -}}
-{{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}}
+{{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
 {{- end -}}
 {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }}
 {{- end }}

releasenotes/notes/keystone.yaml

@@ -13,4 +13,5 @@ keystone:
   - 0.1.10 Update RBAC apiVersion from /v1beta1 to /v1
   - 0.1.11 Remove congress residue
   - 0.1.12 Add helm hook conditional
+  - 0.1.13 Fix Error - wrong number of args for set
 ...