From 9f8d417b5d98e92acf87db8952a94721c2fe4203 Mon Sep 17 00:00:00 2001
From: zhangyeda <zhang_yeda@163.com>
Date: Thu, 6 Apr 2023 13:37:26 +0800
Subject: [PATCH] Fix wrong configFile path in glance bootstrap container.

The configFile path shouble be /etc/glance/glance-api.conf,
not default /etc/glance/glance.conf defined by helm-toolkit,
since secrets mounted in '/etc/glance' have glance-api.conf not glance.conf in it.

The wrong path '/etc/glance/glance.conf' would be a dir in bootstarp container,
and lead to all config files in /etc/glance dir unreachable.

This bug may not affect bootstrap,
but should be fixed in case the config files are needed.

Change-Id: If25966e07ca7f9a80dd0e76ff7663a945db66a23
---
 glance/Chart.yaml                   | 2 +-
 glance/templates/job-bootstrap.yaml | 6 ++++++
 releasenotes/notes/glance.yaml      | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index 8ce62b3a54..cd9fc4f901 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.4.4
+version: 0.4.5
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml
index 56bebfc5be..c1af58dcca 100644
--- a/glance/templates/job-bootstrap.yaml
+++ b/glance/templates/job-bootstrap.yaml
@@ -39,5 +39,11 @@ volumes:
 {{- if .Values.pod.tolerations.glance.enabled -}}
 {{- $_ := set $bootstrapJob "tolerationsEnabled" true -}}
 {{- end -}}
+# The configFile path shouble be /etc/glance/glance-api.conf
+# not default /etc/glance/glance.conf defined by helm-toolkit,
+# since secrets mounted in '/etc/glance' have glance-api.conf not glance.conf in it.
+# The wrong path '/etc/glance/glance.conf' would be dir in bootstarp container,
+# and lead to all config files in '/etc/glance' dir unreachable.
+{{- $_ := set $bootstrapJob "configFile" "/etc/glance/glance-api.conf" -}}
 {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }}
 {{- end }}
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index cd4c164246..b76367215e 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -38,4 +38,5 @@ glance:
   - 0.4.2 Allow Ceph pools to use 1x replication
   - 0.4.3 Update all Ceph images to Focal
   - 0.4.4 Replace node-role.kubernetes.io/master with control-plane
+  - 0.4.5 Fix wrong configFile path in glance bootstrap container.
 ...