benchmark-runner 1.0.756__tar.gz → 1.0.757__tar.gz

{benchmark_runner-1.0.756/benchmark_runner.egg-info → benchmark_runner-1.0.757}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.756
+Version: 1.0.757
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat
@@ -113,6 +113,8 @@ The following options may be passed via command line flags or set in the environ
 
 **mandatory:** KUBEADMIN_PASSWORD=$KUBEADMIN_PASSWORD
 
+**mandatory:** KUBECONFIG_PATH=$KUBECONFIG_PATH [config path inside the container]
+
 **mandatory:** $KUBECONFIG [ kubeconfig file path]
 
 **mandatory:** WORKLOAD=$WORKLOAD
@@ -160,11 +162,11 @@ Not mandatory:
 For example:
 
 ```sh
-podman run --rm -e WORKLOAD="hammerdb_pod_mariadb" -e KUBEADMIN_PASSWORD="1234" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
+podman run --rm -e WORKLOAD="hammerdb_pod_mariadb" -e KUBEADMIN_PASSWORD="1234" -e KUBECONFIG_PATH="/root/.kube/config" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
 ```
 or
 ```sh
-docker run --rm -e WORKLOAD="hammerdb_vm_mariadb" -e KUBEADMIN_PASSWORD="1234" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
+docker run --rm -e WORKLOAD="hammerdb_vm_mariadb" -e KUBEADMIN_PASSWORD="1234" -e KUBECONFIG_PATH="/root/.kube/config" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
 ```
 
 SAVE RUN ARTIFACTS LOCAL:

{benchmark_runner-1.0.756 → benchmark_runner-1.0.757}/README.md

@@ -59,6 +59,8 @@ The following options may be passed via command line flags or set in the environ
 
 **mandatory:** KUBEADMIN_PASSWORD=$KUBEADMIN_PASSWORD
 
+**mandatory:** KUBECONFIG_PATH=$KUBECONFIG_PATH [config path inside the container]
+
 **mandatory:** $KUBECONFIG [ kubeconfig file path]
 
 **mandatory:** WORKLOAD=$WORKLOAD
@@ -106,11 +108,11 @@ Not mandatory:
 For example:
 
 ```sh
-podman run --rm -e WORKLOAD="hammerdb_pod_mariadb" -e KUBEADMIN_PASSWORD="1234" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
+podman run --rm -e WORKLOAD="hammerdb_pod_mariadb" -e KUBEADMIN_PASSWORD="1234" -e KUBECONFIG_PATH="/root/.kube/config" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
 ```
 or
 ```sh
-docker run --rm -e WORKLOAD="hammerdb_vm_mariadb" -e KUBEADMIN_PASSWORD="1234" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
+docker run --rm -e WORKLOAD="hammerdb_vm_mariadb" -e KUBEADMIN_PASSWORD="1234" -e KUBECONFIG_PATH="/root/.kube/config" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
 ```
 
 SAVE RUN ARTIFACTS LOCAL:

{benchmark_runner-1.0.756 → benchmark_runner-1.0.757}/benchmark_runner/common/oc/oc.py

@@ -735,6 +735,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):
         """
@@ -748,7 +762,7 @@ class OC(SSH):
             try:
                 if self.__kubeadmin_password and self.__kubeadmin_password.strip():
                     self.run(
-                        f'{self.__cli} login -u kubeadmin -p {self.__kubeadmin_password}',
+                        f'{self.__cli} login {self.get_kube_api_server()} -u kubeadmin -p {self.__kubeadmin_password}',
                         is_check=True
                     )
                     self._is_logged_in = True  # Mark as logged in globally

{benchmark_runner-1.0.756 → benchmark_runner-1.0.757/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.756
+Version: 1.0.757
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat
@@ -113,6 +113,8 @@ The following options may be passed via command line flags or set in the environ
 
 **mandatory:** KUBEADMIN_PASSWORD=$KUBEADMIN_PASSWORD
 
+**mandatory:** KUBECONFIG_PATH=$KUBECONFIG_PATH [config path inside the container]
+
 **mandatory:** $KUBECONFIG [ kubeconfig file path]
 
 **mandatory:** WORKLOAD=$WORKLOAD
@@ -160,11 +162,11 @@ Not mandatory:
 For example:
 
 ```sh
-podman run --rm -e WORKLOAD="hammerdb_pod_mariadb" -e KUBEADMIN_PASSWORD="1234" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
+podman run --rm -e WORKLOAD="hammerdb_pod_mariadb" -e KUBEADMIN_PASSWORD="1234" -e KUBECONFIG_PATH="/root/.kube/config" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
 ```
 or
 ```sh
-docker run --rm -e WORKLOAD="hammerdb_vm_mariadb" -e KUBEADMIN_PASSWORD="1234" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
+docker run --rm -e WORKLOAD="hammerdb_vm_mariadb" -e KUBEADMIN_PASSWORD="1234" -e KUBECONFIG_PATH="/root/.kube/config" -e PIN_NODE_BENCHMARK_OPERATOR="node_name-0" -e PIN_NODE1="node_name-1" -e PIN_NODE2="node_name-2" -e log_level=INFO -v /root/.kube/config:/root/.kube/config --privileged quay.io/benchmark-runner/benchmark-runner:latest
 ```
 
 SAVE RUN ARTIFACTS LOCAL:

{benchmark_runner-1.0.756 → benchmark_runner-1.0.757}/setup.py

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