feat: add config map for krb5.conf and odbc.ini

support subPath
picodata · Feb 20, 2024 · 503b907 · 503b907
1 parent d565a8f
commit 503b907
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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: