From 503b907664241729e281b6bb7ed235b5fe435239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B8=D1=82=D0=B0=D0=BB=D0=B8=D0=B9=20=D0=A8=D1=83?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=BE=D0=B2?= <v.shunkov@picodata.io>
Date: Tue, 20 Feb 2024 16:11:01 +0300
Subject: [PATCH] feat: add config map for krb5.conf and odbc.ini support
 subPath

---
 helm-charts/tarantool-cartridge/templates/cm.yaml      |  9 ++++++++-
 .../tarantool-cartridge/templates/deployment.yaml      |  3 +++
 helm-charts/tarantool-cartridge/values.yaml            | 10 +++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/helm-charts/tarantool-cartridge/templates/cm.yaml b/helm-charts/tarantool-cartridge/templates/cm.yaml
index 971eb99c..f2bc50b6 100644
--- a/helm-charts/tarantool-cartridge/templates/cm.yaml
+++ b/helm-charts/tarantool-cartridge/templates/cm.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: odbc
+  name: krb5
   namespace: tarantool
 data:
   krb5.conf: |+
@@ -25,6 +25,13 @@ data:
      admin_server = CUDINT217.cud.int
     }
 
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: odbc
+  namespace: tarantool
+data:
   odbc.ini: |+
     [Cloudera Hive ODBC Driver 64-bit]
     Driver=Cloudera Hive ODBC Driver 64-bit
diff --git a/helm-charts/tarantool-cartridge/templates/deployment.yaml b/helm-charts/tarantool-cartridge/templates/deployment.yaml
index 3867775d..6c97ce7d 100644
--- a/helm-charts/tarantool-cartridge/templates/deployment.yaml
+++ b/helm-charts/tarantool-cartridge/templates/deployment.yaml
@@ -98,6 +98,9 @@ spec:
           {{- range $name, $volume := .Volumes }}
           - name: "{{ $name }}"
             mountPath: "{{ $volume.mountpoint }}"
+            {{- if $volume.subPath }}
+            subPath: "{{ $volume.subPath }}"
+            {{- end }}
           {{- end }}
         {{- end }}
         resources:
diff --git a/helm-charts/tarantool-cartridge/values.yaml b/helm-charts/tarantool-cartridge/values.yaml
index 65981c5e..253bf2a1 100644
--- a/helm-charts/tarantool-cartridge/values.yaml
+++ b/helm-charts/tarantool-cartridge/values.yaml
@@ -57,13 +57,21 @@ RoleConfig:
               - key: keytab
                 path: keytab
       odbc:
-        mountpoint: /etc/picodata/
+        mountpoint: /etc/odbc.ini
+        subPath: odbc.ini
         type:
           configMap:
             name: odbc
             items:
               - key: odbc.ini
                 path: odbc.ini
+      krb5:
+        mountpoint: /etc/krb5.conf
+        subPath: krb5.conf
+        type:
+          configMap:
+            name: krb5
+            items:
               - key: krb5.conf
                 path: krb5.conf
     RolesToAssign: