From cfe624f15369c607705fd6ccbf2bb1610b5f54e3 Mon Sep 17 00:00:00 2001 From: Tullio Sebastiani Date: Wed, 7 May 2025 14:43:27 +0100 Subject: [PATCH] changed get_node_ip to krkn-lib and removed kubectl dependency (#799) * changed get_node_ip to krkn-lib and removed kubectl dependency Signed-off-by: Tullio Sebastiani * updated krkn-lib to 5.0.1 Signed-off-by: Tullio Sebastiani --------- Signed-off-by: Tullio Sebastiani --- containers/Dockerfile.template | 4 ---- .../node_actions/openstack_node_scenarios.py | 12 +++++++----- requirements.txt | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/containers/Dockerfile.template b/containers/Dockerfile.template index 6cb86fe9..8ce5a06a 100644 --- a/containers/Dockerfile.template +++ b/containers/Dockerfile.template @@ -25,10 +25,6 @@ RUN dnf update -y ENV KUBECONFIG /home/krkn/.kube/config -# install kubectl -RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" &&\ - cp kubectl /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl &&\ - cp kubectl /usr/bin/kubectl && chmod +x /usr/bin/kubectl # This overwrites any existing configuration in /etc/yum.repos.d/kubernetes.repo RUN dnf update && dnf install -y --setopt=install_weak_deps=False \ diff --git a/krkn/scenario_plugins/node_actions/openstack_node_scenarios.py b/krkn/scenario_plugins/node_actions/openstack_node_scenarios.py index 8e5466ad..ee8f8314 100644 --- a/krkn/scenario_plugins/node_actions/openstack_node_scenarios.py +++ b/krkn/scenario_plugins/node_actions/openstack_node_scenarios.py @@ -14,8 +14,7 @@ class OPENSTACKCLOUD: self.Wait = 30 # Get the instance ID of the node - def get_instance_id(self, node): - openstack_node_ip = nodeaction.get_node_ip(node) + def get_instance_id(self, openstack_node_ip): openstack_node_name = self.get_openstack_nodename(openstack_node_ip) return openstack_node_name @@ -128,7 +127,8 @@ class openstack_node_scenarios(abstract_node_scenarios): try: logging.info("Starting node_start_scenario injection") logging.info("Starting the node %s" % (node)) - openstack_node_name = self.openstackcloud.get_instance_id(node) + openstack_node_ip = self.kubecli.get_node_ip(node) + openstack_node_name = self.openstackcloud.get_instance_id(openstack_node_ip) self.openstackcloud.start_instances(openstack_node_name) self.openstackcloud.wait_until_running(openstack_node_name, timeout, affected_node) nodeaction.wait_for_ready_status(node, timeout, self.kubecli, affected_node) @@ -151,7 +151,8 @@ class openstack_node_scenarios(abstract_node_scenarios): try: logging.info("Starting node_stop_scenario injection") logging.info("Stopping the node %s " % (node)) - openstack_node_name = self.openstackcloud.get_instance_id(node) + openstack_node_ip = self.kubecli.get_node_ip(node) + openstack_node_name = self.openstackcloud.get_instance_id(openstack_node_ip) self.openstackcloud.stop_instances(openstack_node_name) self.openstackcloud.wait_until_stopped(openstack_node_name, timeout, affected_node) logging.info("Node with instance name: %s is in stopped state" % (node)) @@ -173,7 +174,8 @@ class openstack_node_scenarios(abstract_node_scenarios): try: logging.info("Starting node_reboot_scenario injection") logging.info("Rebooting the node %s" % (node)) - openstack_node_name = self.openstackcloud.get_instance_id(node) + openstack_node_ip = self.kubecli.get_node_ip(node) + openstack_node_name = self.openstackcloud.get_instance_id(openstack_node_ip) self.openstackcloud.reboot_instances(openstack_node_name) nodeaction.wait_for_unknown_status(node, timeout, self.kubecli, affected_node) nodeaction.wait_for_ready_status(node, timeout, self.kubecli, affected_node) diff --git a/requirements.txt b/requirements.txt index 0fd36495..8b414714 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ google-cloud-compute==1.22.0 ibm_cloud_sdk_core==3.18.0 ibm_vpc==0.20.0 jinja2==3.1.6 -krkn-lib==5.0.0 +krkn-lib==5.0.1 lxml==5.1.0 kubernetes==28.1.0 numpy==1.26.4