Merge pull request #13 from travisghansen/master

fix truncate bug
nmaupu · Oct 13, 2018 · 608146d · 608146d
2 parents 3220d93 + 9ea8753
commit 608146d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml
@@ -16,7 +16,7 @@ spec:
       serviceAccountName: freenas-nfs-provisioner
       containers:
         - name: freenas-nfs-provisioner
-          image: docker.io/nmaupu/freenas-provisioner:2.1
+          image: docker.io/nmaupu/freenas-provisioner:2.3
           env:
             #- name: IDENTIFIER
             #  value:

diff --git a/provisioner/provisioner.go b/provisioner/provisioner.go
@@ -311,7 +311,7 @@ func (p *freenasProvisioner) Provision(options controller.VolumeOptions) (*v1.Pe
 		MapallGroup:  config.ShareMapallGroup,
 		MaprootUser:  config.ShareMaprootUser,
 		MaprootGroup: config.ShareMaprootGroup,
-		Comment:      fmt.Sprintf("freenas-provisioner (%s): %s", p.Identifier, dsPath)[0:120],
+		Comment:      TruncateString(fmt.Sprintf("freenas-provisioner (%s): %s", p.Identifier, dsPath), 120),
 	}
 
 	glog.Infof("Creating dataset: \"%s\", NFS share: \"%s\"", ds.Name, path)
@@ -549,3 +549,11 @@ func (p *freenasProvisioner) GetSecret(namespace, secretName string) (*v1.Secret
 func BytesToString(data []byte) string {
 	return string(data[:])
 }
+
+func TruncateString(str string, num int) string {
+	bnoden := str
+	if len(str) > num {
+		bnoden = str[:num]
+	}
+	return bnoden
+}