github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/examples/volumes/flexvolume
History
Kubernetes Submit Queue 57414d9b9c Merge pull request #47066 from php-coder/improve_nfs_flex_volume_script 
Automatic merge from submit-queue

examples/volumes/flexvolume/nfs: check for jq and simplify quoting

**What this PR does / why we need it**:

This PR improves error reporting of the nfs flex plugin script. Before it output non-JSON error, when `jq` wasn't installed on the server:
```
$ /usr/libexec/kubernetes/kubelet-plugins/volume/exec/k8s~nfs/nfs getvolumename test
/usr/libexec/kubernetes/kubelet-plugins/volume/exec/k8s~nfs/nfs: line 87: jq: command not found
/usr/libexec/kubernetes/kubelet-plugins/volume/exec/k8s~nfs/nfs: line 88: jq: command not found
{"status": "Success", "volumeName": "/"}
```
K8s fails to unmarshal such output to show an error in the logs:
>E0606 19:32:30.196262   25700 driver-call.go:212] Failed to unmarshal output for command: getvolumename, output: "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/k8s\~nfs/nfs: line 87: jq: command not found\n/usr/libexec/kubernetes/kubelet-plugins/volume/exec/k8s\~nfs/nfs: line 88: jq: command not found\n{\"status\": \"Success\", \"volumeName\": \"/\"}", error: invalid character '/' looking for beginning of value

After  this change:
```sh
$ /usr/libexec/kubernetes/kubelet-plugins/volume/exec/k8s~nfs/nfs getvolumename test
{ "status": "Failure", "message": "'jq' binary not found. Please install jq package before using this driver"}
```
and
> E0606 19:52:07.915594   25700 driver-call.go:219] getvolumename command failed, status: Failure, reason: 'jq' binary not found. Please install jq package before using this driver

Also this PR improves quoting a bit by using single quotes where it possible.

**Release note**:
```release-note
NONE
```

CC @mfojtik
 		2017-07-14 12:42:02 -07:00
..
README.md add redirect notice in all readme files 2017-07-14 17:18:01 +02:00
lvm Remove broken getvolumename and pass PV or volume name to attach call 2017-06-13 00:32:38 -04:00
nfs examples/volumes/flexvolume/nfs: check for jq and simplify quoting. 2017-07-07 19:54:12 +02:00
nginx-nfs.yaml Add support for attacher/detacher interface in Flex volume 2017-02-24 20:18:06 -05:00
nginx.yaml Add support for attacher/detacher interface in Flex volume 2017-02-24 20:18:06 -05:00

README.md

This file has moved to https://github.com/kubernetes/examples/blob/master/staging/volumes/flexvolume/README.md