From 5efdcd9055d4e8faad302b8d0cf2ab09a9e3d240 Mon Sep 17 00:00:00 2001
From: "johannes.wicovsky" <johannes.wicovsky@netgo.de>
Date: Tue, 25 Oct 2022 14:34:15 +0200
Subject: [PATCH] MOB-361: rollout ocr-change to all stages, cleanup

---
 config/default/nsodev/values.yaml                  |  6 ------
 .../default/templates/smardigo-ocr/deployment.yml  | 14 +++++++-------
 config/default/values.yaml                         |  9 +++++++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/config/default/nsodev/values.yaml b/config/default/nsodev/values.yaml
index e0ae58b..1b51771 100644
--- a/config/default/nsodev/values.yaml
+++ b/config/default/nsodev/values.yaml
@@ -8,10 +8,4 @@ smardigo:
   ocr:
     host: prodnso-mobene-nsodev-01-ocr.smardigo.digital
     api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLl92ajdtMXRhdlEzSnJmRmRfSmQzc0EuaFRlMmVBLWZZa21JSEFhRi1jV2tiV2xhcEs5dzVZNFJsRkx6MExMbXVnZy5lY1hoWEZfRmF6Z2RXRDZPdG1fME9B
-    version: 10.2.0
 
-postgres:
-  version: 14
-  db: connect-postgres
-  user: connect-postgres-admin
-  password: connect-postgres-admin
\ No newline at end of file
diff --git a/config/default/templates/smardigo-ocr/deployment.yml b/config/default/templates/smardigo-ocr/deployment.yml
index 041a8e7..f42673e 100644
--- a/config/default/templates/smardigo-ocr/deployment.yml
+++ b/config/default/templates/smardigo-ocr/deployment.yml
@@ -14,15 +14,15 @@ spec:
     spec:
       containers:
       - name: "{{ .Release.Name }}-smardigo-ocr-postgres"
-        image: postgres:{{ .Values.postgres.version }}
+        image: postgres:{{ .Values.smardigo.ocr.postgres.version }}
         imagePullPolicy: Always
         env:
         - name: POSTGRES_DB
-          value: "{{ .Values.postgres.db }}"
+          value: "{{ .Values.smardigo.ocr.postgres.db }}"
         - name: POSTGRES_USER
-          value: "{{ .Values.postgres.user }}"
+          value: "{{ .Values.smardigo.ocr.postgres.user }}"
         - name: POSTGRES_PASSWORD
-          value: "{{ .Values.postgres.password }}"
+          value: "{{ .Values.smardigo.ocr.postgres.password }}"
       - name: "{{ .Release.Name }}-smardigo-ocr-backend"
         image: "{{ .Values.smardigo.ocr.image }}:{{ .Values.smardigo.ocr.version }}"
         imagePullPolicy: Always
@@ -30,11 +30,11 @@ spec:
         - name: SPRING_PROFILES_INCLUDE
           value: "prod,swagger"
         - name: DATASOURCE_URL
-          value: "jdbc:postgresql://localhost:5432/{{ .Values.postgres.db }}"
+          value: "jdbc:postgresql://localhost:5432/{{ .Values.smardigo.ocr.postgres.db }}"
         - name: DATASOURCE_USERNAME
-          value: "{{ .Values.postgres.user }}"
+          value: "{{ .Values.smardigo.ocr.postgres.user }}"
         - name: DATASOURCE_PASSWORD
-          value: "{{ .Values.postgres.password }}"
+          value: "{{ .Values.smardigo.ocr.postgres.password }}"
         - name: EXTERNAL_TASK_OCR_MAX_RETRIES
           value: "5"
         - name: SMA_EXTERNAL_TASK_SCHEDULE_INTERVAL
diff --git a/config/default/values.yaml b/config/default/values.yaml
index 0d99cf2..c3fcf04 100644
--- a/config/default/values.yaml
+++ b/config/default/values.yaml
@@ -10,11 +10,16 @@ smardigo:
     version: 9.0.1
   ocr:
     image: prodnso-harbor-01.smardigo.digital/smardigo/smardigo-ocr-app
-    version: 10.1.7
+    version: 10.2.0
+    postgres:
+      version: 14
+      db: ocr-postgres
+      user: ocr-postgres-admin
+      password: ocr-postgres-admin
 
 mobene:
   uba:
     image: prodnso-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app
     version: 1.0.2
-
+  
 pull_secret: harbor-pull-secret-key