mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-09-19 15:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Fix tracevol to use --config for oc only

Browse Source 
tracevol.py uses --config instead of --kubeconfig when invoked with
-c kubectl and -k <some_path> at the same time.

Signed-off-by: Santiago Sanchez Paz <sanchezpaz@gmail.com>
This commit is contained in:
Santiago Sanchez Paz 2020-08-13 18:07:16 +02:00 committed by mergify[bot]
parent 8c2bdbc001
commit 6ece9bed92
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
troubleshooting/tools/tracevol.py
View File

@ -502,9 +502,10 @@ def get_pv_data(arg, pvname):
pvdata = {} pvdata = {}
cmd = [arg.command] cmd = [arg.command]
if arg.kubeconfig != "": if arg.kubeconfig != "":
cmd += ["--config", arg.kubeconfig] if arg.command == "oc":
else: cmd += ["--config", arg.kubeconfig]
cmd += ["--kubeconfig", arg.kubeconfig] else:
cmd += ["--kubeconfig", arg.kubeconfig]
cmd += ['get', 'pv', pvname, '-o', 'json'] cmd += ['get', 'pv', pvname, '-o', 'json']
out = subprocess.Popen(cmd, stdout=subprocess.PIPE, out = subprocess.Popen(cmd, stdout=subprocess.PIPE,