benchmark-runner 1.0.743__tar.gz → 1.0.744__tar.gz

{benchmark_runner-1.0.743/benchmark_runner.egg-info → benchmark_runner-1.0.744}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.743
+Version: 1.0.744
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.743 → benchmark_runner-1.0.744}/benchmark_runner/common/oc/oc.py

@@ -1,5 +1,6 @@
 
 import os
+import yaml
 import ast
 import shutil
 import time
@@ -46,6 +47,7 @@ class OC(SSH):
             self.__kubeadmin_password = kubeadmin_password
         else:
             self.__kubeadmin_password = self.__environment_variables_dict.get('kubeadmin_password', '')
+        self.__kubeconfig_path = self.__environment_variables_dict.get('kubeconfig_path', '')
 
     def get_ocp_server_version(self):
         """
@@ -715,6 +717,20 @@ class OC(SSH):
         self.run(f"{self.__cli} get events -A > '{output_filename}' ")
         return output_filename
 
+    def get_kube_api_server(self):
+        try:
+            with open(self.__kubeconfig_path, "r") as f:
+                config = yaml.safe_load(f)
+
+            # Extract the API server URL from the clusters section
+            return config["clusters"][0]["cluster"]["server"]
+        except FileNotFoundError:
+            return "Kubeconfig file not found."
+        except KeyError:
+            return "Invalid kubeconfig format. Could not find API server."
+        except Exception as e:
+            return f"Error: {str(e)}"
+
     @logger_time_stamp
     def login(self):
         """
@@ -723,7 +739,7 @@ class OC(SSH):
         """
         try:
             if self.__kubeadmin_password and self.__kubeadmin_password != '':
-                self.run(f'{self.__cli} login -u kubeadmin -p {self.__kubeadmin_password}', is_check=True)
+                self.run(f'{self.__cli} login {self.get_kube_api_server()} -u kubeadmin -p {self.__kubeadmin_password}', is_check=True)
         except Exception as err:
             raise LoginFailed
         return True

{benchmark_runner-1.0.743 → benchmark_runner-1.0.744}/benchmark_runner/main/environment_variables.py

@@ -50,6 +50,7 @@ class EnvironmentVariables:
         # dynamic parameters - configure for local run
         self._environment_variables_dict['workload'] = EnvironmentVariables.get_env('WORKLOAD', '')
         self._environment_variables_dict['kubeadmin_password'] = EnvironmentVariables.get_env('KUBEADMIN_PASSWORD', '')
+        self._environment_variables_dict['kubeconfig_path'] = EnvironmentVariables.get_env('KUBECONFIG_PATH', '')
 
         # PIN=node selector
         self._environment_variables_dict['pin_node_benchmark_operator'] = EnvironmentVariables.get_env('PIN_NODE_BENCHMARK_OPERATOR', '')

{benchmark_runner-1.0.743 → benchmark_runner-1.0.744/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.743
+Version: 1.0.744
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.743 → benchmark_runner-1.0.744}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.743'  # update also .bumpversion.cfg
+__version__ = '1.0.744'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))