From 07808e4f5f938594ed3d106cb2e077d73a241b54 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 18 Dec 2023 04:01:17 +0000 Subject: [PATCH] fix: krb5CacheDirectory mount path issue fix --- charts/README.md | 4 +- charts/latest/csi-driver-smb-v0.0.0.tgz | Bin 4877 -> 4928 bytes .../templates/csi-smb-node.yaml | 11 +++++ charts/latest/csi-driver-smb/values.yaml | 4 +- cmd/smbplugin/main.go | 4 +- pkg/smb/smb.go | 39 +++++++++++------- 6 files changed, 41 insertions(+), 21 deletions(-) diff --git a/charts/README.md b/charts/README.md index 6dc0a3d85d4..0af9fe7e7aa 100644 --- a/charts/README.md +++ b/charts/README.md @@ -102,8 +102,8 @@ The following table lists the configurable parameters of the latest SMB CSI Driv | `linux.dsName` | name of driver daemonset on linux | `csi-smb-node` | | `linux.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `ClusterFirstWithHostNet` | | `linux.kubelet` | configure kubelet directory path on Linux agent node node | `/var/lib/kubelet` | -| `linux.krb5CacheDirectory` | directory for kerberos cache on Linux agent node node | `/var/lib/kubelet/kerberos/` | -| `linux.krb5Prefix` | prefix for kerberos cache on Linux agent node node | `krb5cc_` | +| `linux.krb5CacheDirectory` | directory for kerberos cache on Linux agent node node, empty string means default | `/var/lib/kubelet/kerberos/` | +| `linux.krb5Prefix` | prefix for kerberos cache on Linux agent node node, empty string means default | `krb5cc_` | | `linux.resources.livenessProbe.limits.memory` | liveness-probe memory limits | `100Mi` | | `linux.resources.livenessProbe.requests.cpu` | liveness-probe cpu requests limits | `10m` | | `linux.resources.livenessProbe.requests.memory` | liveness-probe memory requests limits | `20Mi` | diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz index 8c16c585727d7f28c9f02aba7e581981b11230cb..7396208c3bcbd9383aee28bd1e410d0c2fe54155 100644 GIT binary patch delta 4724 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 CBQJOW delta 4688 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 S`M&@F0RR8#$B5