support alternative kubeconfig location

ansibleplaybookbundle · Jun 27, 2018 · 4ffa16b · 4ffa16b
1 parent b2cab86
commit 4ffa16b
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 59 deletions.
diff --git a/src/apb/cli.py b/src/apb/cli.py
@@ -4,6 +4,8 @@
 import argparse
 import pkg_resources
 
+from kubernetes.config import kube_config
+
 import apb.engine
 
 SKIP_OPTIONS = ['provision', 'deprovision', 'bind', 'unbind', 'roles']
@@ -709,6 +711,14 @@ def main():
         default=os.getcwd()
     )
 
+    parser.add_argument(
+        '--kubeconfig',
+        action='store',
+        dest='kubeconfig',
+        help=u'OpenShift/Kubernetes configuration file path.',
+        default=kube_config.KUBE_CONFIG_DEFAULT_LOCATION
+    )
+
     parser.add_argument(
         '--token',
         action='store',
@@ -737,9 +747,9 @@ def main():
         print("Version: apb-%s" % version)
         sys.exit(0)
 
-    try:
-        getattr(apb.engine,
-                u'cmdrun_{}'.format(args.subcommand))(**vars(args))
-    except Exception as e:
-        print("Exception occurred! %s" % e)
-        sys.exit(1)
+    #try:
+    getattr(apb.engine,
+            u'cmdrun_{}'.format(args.subcommand))(**vars(args))
+    #except Exception as e:
+    #    print("Exception occurred! %s" % e)
+    #    sys.exit(1)