openstack/openstack-helm
Code Issues Proposed changes

Merge "Fix job annotations for db init job in barbican"

Browse Source
This commit is contained in:
Zuul 2022-04-24 08:30:05 +00:00 committed by Gerrit Code Review
commit 5594f09743
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Barbican description: OpenStack-Helm Barbican
name: barbican name: barbican
version: 0.2.10 version: 0.2.11
home: https://docs.openstack.org/barbican/latest/ home: https://docs.openstack.org/barbican/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
sources: sources:

4
barbican/templates/job-db-init.yaml
View File

@ -21,8 +21,8 @@ helm.sh/hook-weight: "-5"
{{- if .Values.manifests.job_db_init }} {{- if .Values.manifests.job_db_init }}
{{- $serviceName := "barbican" -}} {{- $serviceName := "barbican" -}}
{{- $dbToInit := dict "adminSecret" .Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "DEFAULT" "configDbKey" "sql_connection" "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}} {{- $dbToInit := dict "adminSecret" .Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "DEFAULT" "configDbKey" "sql_connection" -}}
{{- $dbInitJob := dict "envAll" . "serviceName" $serviceName "dbToInit" $dbToInit -}} {{- $dbInitJob := dict "envAll" . "serviceName" $serviceName "dbToInit" $dbToInit "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}}
{{- if .Values.manifests.certificates -}} {{- if .Values.manifests.certificates -}}
{{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
{{- end -}} {{- end -}}

1
releasenotes/notes/barbican.yaml
View File

@ -14,4 +14,5 @@ barbican:
- 0.2.8 Update htk requirements repo - 0.2.8 Update htk requirements repo
- 0.2.9 Removed default policy in favor in code policy - 0.2.9 Removed default policy in favor in code policy
- 0.2.10 Enable taint toleration for Openstack services - 0.2.10 Enable taint toleration for Openstack services
- 0.2.11 Fix job annotations for db init job
... ...