From 79fb4d8860c5f9744742f4549406a11b2a936840 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?= Date: Mon, 19 Feb 2024 13:05:39 +0300 Subject: [PATCH] feat: add config map for krb5.conf and odbc.ini add keytab NO_DOC=internal NO_TEST=internal NO_CHANGELOG=internal --- .../tarantool-cartridge/templates/cm.yaml | 59 +++++++++++++++++ helm-charts/tarantool-cartridge/values.yaml | 65 ++++++++++++++----- 2 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 helm-charts/tarantool-cartridge/templates/cm.yaml diff --git a/helm-charts/tarantool-cartridge/templates/cm.yaml b/helm-charts/tarantool-cartridge/templates/cm.yaml new file mode 100644 index 00000000..a40a120d --- /dev/null +++ b/helm-charts/tarantool-cartridge/templates/cm.yaml @@ -0,0 +1,59 @@ +{{- if .Volumes }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: krb5 + namespace: tarantool +data: + krb5.conf: |+ + [libdefaults] + default_realm = CUD.INT + allow_weak_crypto = true + dns_lookup_kdc = false + dns_lookup_realm = false + ticket_lifetime = 86400 + renew_lifetime = 604800 + forwardable = true + default_tgs_enctypes = rc4-hmac + default_tkt_enctypes = rc4-hmac + permitted_enctypes = rc4-hmac + udp_preference_limit = 1 + kdc_timeout = 3000 + + [realms] + CUD.INT = { + kdc = CUDINT217.cud.int + 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 + Description=Hive Cloudera ODBC Driver + Host=name02.cud.int + Port=10000 + Schema=default + ServiceDiscoveryMode=0 + HiveServerType=2 + AuthMech=1 + ThriftTransport=2 + UseNativeQuery=0 + UID=visiology-kauth + KrbHostFQDN=cudint217.cud.int + Keytab=/tmp/key.keytab + GetTablesWithQuery=1 + KrbServiceName=hive + KrbRealm=CUD.INT + KrbAuthType=0 + SSL=0 + +--- +{{- end }} \ No newline at end of file diff --git a/helm-charts/tarantool-cartridge/values.yaml b/helm-charts/tarantool-cartridge/values.yaml index 70f0a27a..e2e99126 100644 --- a/helm-charts/tarantool-cartridge/values.yaml +++ b/helm-charts/tarantool-cartridge/values.yaml @@ -1,17 +1,15 @@ -# Declare variables to be passed into your templates. - ClusterEnv: dev ClusterName: tarantool-cluster ClusterDomainName: cluster.local TarantoolWorkDir: /var/lib/tarantool -LuaMemoryReserveMB: 4096 +LuaMemoryReserveMB: 2048 persistence: storageClassName: local-path image: - repository: tarantool/tarantool-operator-examples-kv - tag: 0.0.4 + repository: docker-public.binary.picodata.io/kirovets + tag: kube pullPolicy: IfNotPresent securityContext: @@ -29,26 +27,63 @@ RoleConfig: - RoleName: routers # ReplicaSet name ReplicaCount: 1 # Number of replicas in each ReplicaSet ReplicaSetCount: 1 # Number of ReplicaSets for this role(s) - DiskSize: 1Gi # Persistent Volume disk sze - CPUallocation: 0.25 # Number of vCPUs to allocate to each container + DiskSize: 16Gi # Persistent Volume disk sze + CPUallocation: 2 # Number of vCPUs to allocate to each container MemtxMemoryMB: 256 # MB of memory to be assigned to each container RolesToAssign: + - failover-coordinator + - vshard-router - app.roles.router - - RoleName: storage - ReplicaCount: 2 + - RoleName: exporter + ReplicaCount: 1 ReplicaSetCount: 1 - DiskSize: 1Gi - CPUallocation: 0.25 - MemtxMemoryMB: 256 + DiskSize: 16Gi + CPUallocation: 2 + MemtxMemoryMB: 1024 Volumes: - testVolume: - mountpoint: /foo + share: + mountpoint: /opt/share type: hostPath: - path: /mnt + path: /mnt/share type: Directory + krb5: + mountpoint: /etc/ + type: + configMap: + name: krb5 + items: + - key: krb5.conf + path: krb5.conf + odbc: + mountpoint: /etc/ + type: + configMap: + name: odbc + items: + - key: odbc.ini + path: odbc.ini + keytab: + mountpoint: /opt/cloudera/ + type: + configMap: + name: keytab + items: + - key: keytab + path: keytab + RolesToAssign: + - app.roles.exporter + - vshard-router + + - RoleName: storage + ReplicaCount: 2 + ReplicaSetCount: 1 + DiskSize: 16Gi + CPUallocation: 2 + MemtxMemoryMB: 4096 RolesToAssign: + - vshard-storage - app.roles.storage ingress: