From 2e5920835190e79317b03ccdd4355732748d38c2 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Thu, 8 Jun 2023 07:34:34 +0300
Subject: [PATCH] Fix grafana job deployment condition

The run migrator job should be deployed
if .Values.manifests.job_run_migrator is true

story: 2010696
task: 47809
Change-Id: I5717d8c6c2de270268a0e14ee4b8abb7969b07bb
---
 grafana/Chart.yaml                      |  2 +-
 grafana/templates/job-run-migrator.yaml |  2 +-
 grafana/values_overrides/sqlite3.yaml   | 24 ++++++++++++++++++++++++
 releasenotes/notes/grafana.yaml         |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 grafana/values_overrides/sqlite3.yaml

diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml
index 69df9b64e..02e1a36b5 100644
--- a/grafana/Chart.yaml
+++ b/grafana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v9.2.10
 description: OpenStack-Helm Grafana
 name: grafana
-version: 0.1.20
+version: 0.1.21
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana
diff --git a/grafana/templates/job-run-migrator.yaml b/grafana/templates/job-run-migrator.yaml
index e8d64c19c..d87e92501 100644
--- a/grafana/templates/job-run-migrator.yaml
+++ b/grafana/templates/job-run-migrator.yaml
@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.deployment }}
+{{- if .Values.manifests.job_run_migrator }}
 {{- $envAll := . }}
 
 {{- $mounts_grafana := .Values.pod.mounts.grafana.grafana }}
diff --git a/grafana/values_overrides/sqlite3.yaml b/grafana/values_overrides/sqlite3.yaml
new file mode 100644
index 000000000..3bc2ad704
--- /dev/null
+++ b/grafana/values_overrides/sqlite3.yaml
@@ -0,0 +1,24 @@
+---
+dependencies:
+  static:
+    grafana:
+      jobs: null
+      services: null
+manifests:
+  job_db_init: false
+  job_db_init_session: false
+  job_db_session_sync: false
+  job_image_repo_sync: true
+  job_run_migrator: false
+  job_set_admin_user: false
+  secret_db: false
+  secret_db_session: false
+conf:
+  grafana:
+    database:
+      type: sqlite3
+      path: /var/lib/grafana/data/sqlite3.db
+    session:
+      provider: file
+      provider_config: sessions
+...
diff --git a/releasenotes/notes/grafana.yaml b/releasenotes/notes/grafana.yaml
index e88d34fab..1fc6c0406 100644
--- a/releasenotes/notes/grafana.yaml
+++ b/releasenotes/notes/grafana.yaml
@@ -21,4 +21,5 @@ grafana:
   - 0.1.18 Migrator job is now mariadb-fail-proof
   - 0.1.19 Update grafana to 9.2.10
   - 0.1.20 Upgrade osh-selenium image to latest-ubuntu_focal
+  - 0.1.21 Fix run migrator job deployment condition
 ...