specify kubeconfig file

When running createrapidk8s.py, you can now specify the kubeconfig file
to be used. Check the help option for this parameter. The parameter is
optional.

Signed-off-by: Luc Provoost <luc.provoost@gmail.com>
Change-Id: Ic4b5fcb68cfda1cf39651600d7d40311ffe56c72

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/createrapidk8s.py b/VNFs/DPPD-PROX/helper-scripts/rapid/createrapidk8s.py
index 8b0e4a6..9f9d361 100755 (executable)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/createrapidk8s.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/createrapidk8s.py
@@ -28,13 +28,17 @@ RUN_CONFIG_FILE_NAME = "rapid.env"
 def main():
     # Parse command line arguments
     argparser = argparse.ArgumentParser()
+    argparser.add_argument("-k", "--kubeconfig", type = str, required = False,
+                           default = None,
+                           help = "Specify the kubeconfig to be used")
+
     argparser.add_argument("-c", "--clean", action = "store_true",
                            help = "Terminate pod-rapid-* PODs. "
                            "Clean up cluster before or after the testing.")
     args = argparser.parse_args()
 
     # Create a new deployment
-    deployment = K8sDeployment()
+    deployment = K8sDeployment(kubeconfig = args.kubeconfig)
 
     # Load config file with test environment description
     deployment.load_create_config(CREATE_CONFIG_FILE_NAME)

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_k8s_deployment.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_k8s_deployment.py
index c9aca3c..282f327 100644 (file)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_k8s_deployment.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_k8s_deployment.py
@@ -43,7 +43,7 @@ class K8sDeployment:
     _namespace = "rapid-testing"
     _pods = []
 
-    def __init__(self):
+    def __init__(self, kubeconfig = None):
         # Configure logger
         self._log = logging.getLogger("k8srapid")
         self._log.setLevel(logging.DEBUG)
@@ -66,7 +66,7 @@ class K8sDeployment:
 
         # Initialize k8s plugin
         try:
-            config.load_kube_config()
+            config.load_kube_config(config_file = kubeconfig)
         except:
             config.load_incluster_config()