robusta-cli 0.10.30a0__tar.gz → 0.10.31__tar.gz

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 0.10.30a0
+Version: 0.10.31
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "0.10.30-alpha"
+version = "0.10.31"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 packages = [

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/_version.py

@@ -1,2 +1,2 @@
 # this is updated by .github/workflows/release.yaml
-__version__ = "0.10.30-alpha"
+__version__ = "0.10.31"

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/core/discovery/discovery.py

@@ -7,7 +7,17 @@ from concurrent.futures.process import ProcessPoolExecutor
 from typing import Dict, List, Optional, Union
 
 import prometheus_client
-from hikaru.model.rel_1_26 import Container, DaemonSet, Deployment, Job, Pod, ReplicaSet, StatefulSet, Volume
+from hikaru.model.rel_1_26 import (
+    Container,
+    DaemonSet,
+    Deployment,
+    Job,
+    ObjectMeta,
+    Pod,
+    ReplicaSet,
+    StatefulSet,
+    Volume,
+)
 from kubernetes import client
 from kubernetes.client import (
     V1Container,
@@ -21,6 +31,7 @@ from kubernetes.client import (
     V1ObjectMeta,
     V1Pod,
     V1PodList,
+    V1PodTemplateSpec,
     V1ReplicaSetList,
     V1StatefulSet,
     V1StatefulSetList,
@@ -36,11 +47,13 @@ from robusta.core.model.env_vars import (
     DISCOVERY_MAX_BATCHES,
     DISCOVERY_POD_OWNED_PODS,
     DISCOVERY_PROCESS_TIMEOUT_SEC,
+    IS_OPENSHIFT,
 )
 from robusta.core.model.helm_release import HelmRelease
 from robusta.core.model.jobs import JobInfo
 from robusta.core.model.namespaces import NamespaceInfo
 from robusta.core.model.services import ContainerInfo, ServiceConfig, ServiceInfo, VolumeInfo
+from robusta.integrations.kubernetes.custom_models import DeploymentConfig, DictToK8sObj
 from robusta.patch.patch import create_monkey_patches
 from robusta.utils.cluster_provider_discovery import cluster_provider
 from robusta.utils.stack_tracer import StackTracer
@@ -93,6 +106,35 @@ class Discovery:
         except Exception:
             logging.error("error getting stack trace", exc_info=True)
 
+    @staticmethod
+    def __create_service_info_from_hikaru(
+        meta: ObjectMeta,
+        kind: str,
+        containers: List[Container],
+        volumes: List[Volume],
+        total_pods: int,
+        ready_pods: int,
+        is_helm_release: bool = False,
+    ) -> ServiceInfo:
+        container_info = (
+            [ContainerInfo.get_container_info_hikaru(container) for container in containers] if containers else []
+        )
+        volumes_info = [VolumeInfo.get_volume_info(volume) for volume in volumes] if volumes else []
+        config = ServiceConfig(labels=meta.labels or {}, containers=container_info, volumes=volumes_info)
+        version = getattr(meta, "resource_version", None) or getattr(meta, "resourceVersion", None)
+        resource_version = int(version) if version else 0
+
+        return ServiceInfo(
+            resource_version=resource_version,
+            name=meta.name,
+            namespace=meta.namespace,
+            service_type=kind,
+            service_config=config,
+            ready_pods=ready_pods,
+            total_pods=total_pods,
+            is_helm_release=is_helm_release,
+        )
+
     @staticmethod
     def __create_service_info(
         meta: V1ObjectMeta,
@@ -121,12 +163,12 @@ class Discovery:
         )
 
     @staticmethod
-    def create_service_info(obj: Union[Deployment, DaemonSet, StatefulSet, Pod, ReplicaSet]) -> ServiceInfo:
-        return Discovery.__create_service_info(
+    def create_service_info_from_hikaru(obj: Union[Deployment, DaemonSet, StatefulSet, Pod, ReplicaSet]) -> ServiceInfo:
+        return Discovery.__create_service_info_from_hikaru(
             obj.metadata,
             obj.kind,
-            extract_containers(obj),
-            extract_volumes(obj),
+            extract_containers_k8(obj),
+            extract_volumes_k8(obj),
             extract_total_pods(obj),
             extract_ready_pods(obj),
             is_helm_release=is_release_managed_by_helm(
@@ -142,11 +184,56 @@ class Discovery:
         pods_metadata: List[V1ObjectMeta] = []
         node_requests = defaultdict(list)  # map between node name, to request of pods running on it
         active_services: List[ServiceInfo] = []
+
         # discover micro services
         try:
+            continue_ref: Optional[str] = None
+            if IS_OPENSHIFT:
+                for _ in range(DISCOVERY_MAX_BATCHES):
+                    try:
+                        deployconfigs_res = client.CustomObjectsApi().list_cluster_custom_object(
+                            group=DeploymentConfig.group,
+                            version=DeploymentConfig.version,
+                            plural=DeploymentConfig.plural,
+                            limit=DISCOVERY_BATCH_SIZE,
+                            _continue=continue_ref,
+                        )
+                    except Exception:
+                        logging.exception(msg="Failed to list Deployment configs from api.")
+                        break
+
+                    for dc in deployconfigs_res.get("items", []):
+                        try:
+                            meta = DictToK8sObj(dc.get("metadata"), V1ObjectMeta)
+                            spec = dc.get("spec", {})
+                            template = DictToK8sObj(spec.get("template"), V1PodTemplateSpec)
+
+                            active_services.extend(
+                                [
+                                    Discovery.__create_service_info(
+                                        meta=meta,
+                                        kind="DeploymentConfig",
+                                        containers=template.spec.containers,
+                                        volumes=template.spec.volumes,
+                                        total_pods=spec.get("replicas", 1),
+                                        ready_pods=dc.get("status", {}).get("readyReplicas", 0),
+                                        is_helm_release=is_release_managed_by_helm(
+                                            annotations=meta.annotations, labels=meta.labels
+                                        ),
+                                    )
+                                ]
+                            )
+                        except Exception:
+                            logging.exception(msg=f"Failed to parse Deployment config/n {dc}")
+                            continue
+
+                    continue_ref = deployconfigs_res.get("metadata", {}).get("continue")
+                    if not continue_ref:
+                        break
+
             # discover deployments
             # using k8s api `continue` to load in batches
-            continue_ref: Optional[str] = None
+            continue_ref = None
             for _ in range(DISCOVERY_MAX_BATCHES):
                 deployments: V1DeploymentList = client.AppsV1Api().list_deployment_for_all_namespaces(
                     limit=DISCOVERY_BATCH_SIZE, _continue=continue_ref
@@ -608,6 +695,7 @@ def extract_total_pods(resource) -> int:
             return 0 if not resource.status.desiredNumberScheduled else resource.status.desiredNumberScheduled
         elif isinstance(resource, Pod):
             return 1
+
         if isinstance(resource, V1Deployment) or isinstance(resource, V1StatefulSet):
             # resource.spec.replicas can be 0, default value is 1
             return resource.spec.replicas if resource.spec.replicas is not None else 1

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/core/discovery/resource_names.py

@@ -3,6 +3,7 @@ from typing import Callable, List, Optional
 from kubernetes import client
 from pydantic import BaseModel
 
+from robusta.integrations.kubernetes.custom_models import DeploymentConfig
 from robusta.utils.error_codes import ActionException, ErrorCodes
 
 
@@ -54,6 +55,10 @@ LISTERS = {  # TODO add ingress and cronjobs once upgrading the k8s client versi
         list_all=client.NetworkingV1Api().list_ingress_for_all_namespaces,
         list_namespaced=client.NetworkingV1Api().list_namespaced_ingress,
     ),
+    "deploymentconfig": ResourceLister(
+        list_all=DeploymentConfig.list_for_all_namespaces,
+        list_namespaced=DeploymentConfig.list_namespaced,
+    ),
 }
 
 

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/core/model/services.py

@@ -41,7 +41,7 @@ class ContainerInfo(BaseModel):
         return ContainerInfo(name=container.name, image=container.image, env=env, resources=resources, ports=ports)
 
     @staticmethod
-    def get_container_info_k8(container: Container) -> "ContainerInfo":
+    def get_container_info_hikaru(container: Container) -> "ContainerInfo":
         env = (
             [EnvVar(name=env.name, value=env.value) for env in container.env if env.name and env.value]
             if container.env

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/core/playbooks/pod_utils/imagepull_utils.py

@@ -126,7 +126,7 @@ class ImagePullBackoffInvestigator:
     configs = [
         # Containerd
         {
-            "err_template": 'failed to pull and unpack image ".*?": failed to resolve reference ".*?": .*?: not found',
+            "err_template": r'failed to pull and unpack image ".*?": failed to resolve reference ".*?": .*?(no such host|not found)',
             "reason": ImagePullBackoffReason.RepoDoesntExist,
         },
         {

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/core/sinks/robusta/robusta_sink.py

@@ -199,7 +199,7 @@ class RobustaSink(SinkBase, EventHandler):
     ):
         try:
             if isinstance(new_resource, (Deployment, DaemonSet, StatefulSet, ReplicaSet, Pod)):
-                self.__publish_single_service(Discovery.create_service_info(new_resource), operation)
+                self.__publish_single_service(Discovery.create_service_info_from_hikaru(new_resource), operation)
             elif isinstance(new_resource, Node):
                 self.__update_node(new_resource, operation)
             # if the jobs cache isn't initalized you will have exceptions in __update_job

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/integrations/git/git_repo.py

@@ -40,7 +40,7 @@ class GitRepoManager:
                 key = key.strip()
                 if key:
                     logging.debug(f"Adding a key to known_hosts: {key}")
-                    f.write(key)
+                    f.write(key + "\n")
 
         if GIT_REPOS_VERIFIED_HOSTS:
             os.system(f"ssh-keyscan -H {GIT_REPOS_VERIFIED_HOSTS} >> {SSH_ROOT_DIR}/known_hosts")

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/integrations/kubernetes/autogenerated/events.py

@@ -2,40 +2,45 @@
 
 import logging
 import traceback
-from abc import abstractmethod
 from dataclasses import dataclass
-from typing import List, Optional, Union
-
+from abc import abstractmethod
 from hikaru.model.rel_1_26 import (
-    ClusterRole,
-    ClusterRoleBinding,
-    ConfigMap,
+    Pod,
+    ReplicaSet,
     DaemonSet,
     Deployment,
+    StatefulSet,
+    Service,
     Event,
     HorizontalPodAutoscaler,
-    Ingress,
+    Node,
+    ClusterRole,
+    ClusterRoleBinding,
     Job,
     Namespace,
-    NetworkPolicy,
-    Node,
+    ServiceAccount,
     PersistentVolume,
     PersistentVolumeClaim,
-    Pod,
-    ReplicaSet,
-    Service,
-    ServiceAccount,
-    StatefulSet,
+    NetworkPolicy,
+    ConfigMap,
+    Ingress,
 )
+from hikaru.utils import Response
+from pydantic import BaseModel
+from typing import Union, Optional, List
+from ..base_event import K8sBaseChangeEvent
+from ....core.model.events import ExecutionBaseEvent, ExecutionEventBaseParams
+from ....core.reporting.base import FindingSubject
+from ....core.reporting.consts import FindingSubjectType, FindingSource
+from ....core.reporting.finding_subjects import KubeObjFindingSubject
+from robusta.integrations.kubernetes.custom_models import RobustaPod, RobustaDeployment, RobustaJob, DeploymentConfig
 from hikaru.model.rel_1_26.v1 import ClusterRole as v1ClusterRole
 from hikaru.model.rel_1_26.v1 import ClusterRoleBinding as v1ClusterRoleBinding
 from hikaru.model.rel_1_26.v1 import ConfigMap as v1ConfigMap
 from hikaru.model.rel_1_26.v1 import DaemonSet as v1DaemonSet
 from hikaru.model.rel_1_26.v1 import Deployment as v1Deployment
 from hikaru.model.rel_1_26.v1 import Event as v1Event
-from hikaru.model.rel_1_26.v1 import (
-    HorizontalPodAutoscaler as v1HorizontalPodAutoscaler,
-)
+from hikaru.model.rel_1_26.v1 import HorizontalPodAutoscaler as v1HorizontalPodAutoscaler
 from hikaru.model.rel_1_26.v1 import Ingress as v1Ingress
 from hikaru.model.rel_1_26.v1 import Job as v1Job
 from hikaru.model.rel_1_26.v1 import Namespace as v1Namespace
@@ -48,20 +53,7 @@ from hikaru.model.rel_1_26.v1 import ReplicaSet as v1ReplicaSet
 from hikaru.model.rel_1_26.v1 import Service as v1Service
 from hikaru.model.rel_1_26.v1 import ServiceAccount as v1ServiceAccount
 from hikaru.model.rel_1_26.v1 import StatefulSet as v1StatefulSet
-from hikaru.utils import Response
-from pydantic import BaseModel
-
-from robusta.integrations.kubernetes.custom_models import (
-    RobustaDeployment,
-    RobustaJob,
-    RobustaPod,
-)
 
-from ....core.model.events import ExecutionBaseEvent, ExecutionEventBaseParams
-from ....core.reporting.base import FindingSubject
-from ....core.reporting.consts import FindingSource, FindingSubjectType
-from ....core.reporting.finding_subjects import KubeObjFindingSubject
-from ..base_event import K8sBaseChangeEvent
 
 LOADERS_MAPPINGS = {
     "pod": (True, RobustaPod.readNamespacedPod),
@@ -83,6 +75,7 @@ LOADERS_MAPPINGS = {
     "networkpolicy": (True, NetworkPolicy.readNamespacedNetworkPolicy),
     "configmap": (True, ConfigMap.readNamespacedConfigMap),
     "ingress": (True, Ingress.readNamespacedIngress),
+    "deploymentconfig": (True, DeploymentConfig.readNamespaced),
 }
 
 
@@ -128,6 +121,7 @@ class KubernetesResourceEvent(ExecutionBaseEvent):
             NetworkPolicy,
             ConfigMap,
             Ingress,
+            DeploymentConfig,
         ]
     ] = None
 
@@ -153,6 +147,7 @@ class KubernetesResourceEvent(ExecutionBaseEvent):
             NetworkPolicy,
             ConfigMap,
             Ingress,
+            DeploymentConfig,
         ],
         named_sinks: List[str],
     ):
@@ -182,6 +177,7 @@ class KubernetesResourceEvent(ExecutionBaseEvent):
             NetworkPolicy,
             ConfigMap,
             Ingress,
+            DeploymentConfig,
         ]
     ]:
         return self.obj

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/integrations/kubernetes/autogenerated/v1/models.py

@@ -1,8 +1,8 @@
 # This file was autogenerated. Do not edit.
 
 from hikaru.model.rel_1_26.v1 import *
-from robusta.integrations.kubernetes.custom_models import RobustaPod,RobustaDeployment,RobustaJob
 
+from robusta.integrations.kubernetes.custom_models import DeploymentConfig, RobustaDeployment, RobustaJob, RobustaPod
 
 KIND_TO_MODEL_CLASS = {
     "Pod": RobustaPod,
@@ -23,5 +23,5 @@ KIND_TO_MODEL_CLASS = {
     "PersistentVolumeClaim": PersistentVolumeClaim,
     "NetworkPolicy": NetworkPolicy,
     "ConfigMap": ConfigMap,
-    "Ingress": Ingress
+    "Ingress": Ingress,
 }

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/integrations/kubernetes/custom_models.py

@@ -1,13 +1,15 @@
-import json
 import logging
 import re
 import time
+from dataclasses import dataclass
 from enum import Enum, auto
-from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Type, TypeVar
+from typing import TYPE_CHECKING, ClassVar, Dict, List, Optional, Tuple, Type, TypeVar, Union
 
 import hikaru
 import yaml
+from hikaru.crd import HikaruCRDDocumentMixin, register_crd_class
 from hikaru.model.rel_1_26 import *  # * import is necessary for hikaru subclasses to work
+from kubernetes import client
 from kubernetes.client import ApiException
 from pydantic import BaseModel
 
@@ -33,7 +35,7 @@ T = TypeVar("T")
 
 
 # TODO: import these from the python-tools project
-PYTHON_DEBUGGER_IMAGE = f"{IMAGE_REGISTRY}/debug-toolkit:v5.0"
+PYTHON_DEBUGGER_IMAGE = f"{IMAGE_REGISTRY}/debug-toolkit:v6.0"
 JAVA_DEBUGGER_IMAGE = f"{IMAGE_REGISTRY}/java-toolkit-11:jattach"
 
 
@@ -57,13 +59,18 @@ def _get_match_expression_filter(expression: LabelSelectorRequirement) -> str:
     return f"{expression.key} {expression.operator} ({values})"
 
 
-def build_selector_query(selector: LabelSelector) -> str:
-    label_filters = [f"{label[0]}={label[1]}" for label in selector.matchLabels.items()]
-    label_filters.extend([_get_match_expression_filter(expression) for expression in selector.matchExpressions])
-    return ",".join(label_filters)
+def build_selector_query(selector: Union[LabelSelector, Dict]) -> str:
+    if isinstance(selector, LabelSelector):
+        label_filters = [f"{label[0]}={label[1]}" for label in selector.matchLabels.items()]
+        label_filters.extend([_get_match_expression_filter(expression) for expression in selector.matchExpressions])
+        return ",".join(label_filters)
+    else:
+        return ",".join([f"{k}={v}" for k, v in selector.items()])
 
 
-def list_pods_using_selector(namespace: str, selector: LabelSelector, field_selector: str = None) -> List[Pod]:
+def list_pods_using_selector(
+    namespace: str, selector: Union[LabelSelector, Dict], field_selector: str = None
+) -> List[Pod]:
     labels_selector = build_selector_query(selector)
     return PodList.listNamespacedPod(
         namespace=namespace,
@@ -530,6 +537,97 @@ class RobustaJob(Job):
         return cls.run_simple_job_spec(spec, name=image, timeout=timeout)
 
 
+@dataclass
+class DeploymentTriggerPolicy(HikaruBase):
+    imageChangeParams: Optional[Dict]
+    type: Optional[str]
+
+
+@dataclass
+class DeploymentConfigStatus(HikaruBase):
+    conditions: Optional[List[DeploymentCondition]]
+    details: Optional[Dict]
+    updatedReplicas: Optional[int]
+    readyReplicas: Optional[int]
+    availableReplicas: int = 0
+    latestVersion: int = 0
+    observedGeneration: int = 0
+    replicas: int = 0
+    unavailableReplicas: int = 0
+
+
+@dataclass
+class DeploymentConfigSpec(HikaruBase):
+    selector: Optional[Dict[str, str]]
+    strategy: Optional[Dict]
+    template: Optional[PodTemplateSpec]
+    test: Optional[bool]
+    triggers: Optional[List[DeploymentTriggerPolicy]] = None
+    minReadySeconds: Optional[int] = 0
+    paused: Optional[bool] = None
+    replicas: Optional[int] = None
+    revisionHistoryLimit: Optional[int] = None
+
+
+# https://docs.openshift.com/container-platform/3.11/rest_api/apps_openshift_io/deploymentconfig-apps-openshift-io-v1.html
+@dataclass
+class DeploymentConfig(HikaruDocumentBase, HikaruCRDDocumentMixin):
+    plural: ClassVar[str] = "deploymentconfigs"
+    group: ClassVar[str] = "apps.openshift.io"
+    version: ClassVar[str] = "v1"
+
+    metadata: ObjectMeta
+    spec: Optional[DeploymentConfigSpec] = None
+    status: Optional[DeploymentConfigStatus] = None
+    apiVersion: str = f"{group}/{version}"
+    kind: str = "DeploymentConfig"
+
+    @classmethod
+    def readNamespaced(self, name: str, namespace: str):
+        obj = DeploymentConfig(metadata=ObjectMeta(name=name, namespace=namespace)).read()
+        return type("", (object,), {"obj": obj})()
+    
+    @classmethod
+    def list_namespaced(self, namespace: str):
+        deployconfigs_res = client.CustomObjectsApi().list_namespaced_custom_object(
+            group=DeploymentConfig.group,
+            version=DeploymentConfig.version,
+            namespace=namespace,
+            plural=DeploymentConfig.plural,
+        ) 
+        dc_list = type("", (object,), {"items": [
+            DeploymentConfig(metadata=ObjectMeta(**dc.get("metadata", {})), spec=DeploymentConfigSpec(**dc.get("spec", {})))
+            for dc in
+            deployconfigs_res.get("items", [])
+        ]})()
+
+        return dc_list
+    
+    @classmethod
+    def list_for_all_namespaces(self):
+        deployconfigs_res = client.CustomObjectsApi().list_cluster_custom_object(
+            group=DeploymentConfig.group,
+            version=DeploymentConfig.version,
+            plural=DeploymentConfig.plural,
+        ) 
+        dc_list = type("", (object,), {"items": [
+            DeploymentConfig(metadata=ObjectMeta(**dc.get("metadata", {})), spec=DeploymentConfigSpec(**dc.get("spec", {})))
+            for dc in
+            deployconfigs_res.get("items", [])
+        ]})()
+
+        return dc_list
+
+
+def DictToK8sObj(obj: Dict, class_name):
+    # Accessing Kubernetes python client private method directly which is not ideal.
+    # The reason is missing functionality to deserialize a dict to a model.
+    # This is helpful in the case of CRD's and sub models.
+    # This could potentially break on a client upgrade.
+    return client.ApiClient()._ApiClient__deserialize(obj, class_name)
+
+
 hikaru.register_version_kind_class(RobustaPod, Pod.apiVersion, Pod.kind)
 hikaru.register_version_kind_class(RobustaDeployment, Deployment.apiVersion, Deployment.kind)
 hikaru.register_version_kind_class(RobustaJob, Job.apiVersion, Job.kind)
+register_crd_class(DeploymentConfig, DeploymentConfig.plural, is_namespaced=True)

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/integrations/kubernetes/process_utils.py

@@ -8,7 +8,7 @@ from robusta.integrations.kubernetes.custom_models import Process, RobustaPod
 
 
 class ProcessType(Enum):
-    PYTHON = "python"
+    PYTHON = "python3"
     JAVA = "java"
 
 

{robusta_cli-0.10.30a0 → robusta_cli-0.10.31}/src/robusta/integrations/webex/sender.py

@@ -75,7 +75,7 @@ class WebexSender:
                     {
                         "type": "Column",
                         "width": "stretch",
-                        "items": [{"type": "TextBlock", "text": header, "wrap": "true"}],
+                        "items": [{"type": "TextBlock", "text": header, "wrap": True}],
                     }
                 )
             # seperating each row to add below headers of column
@@ -87,7 +87,7 @@ class WebexSender:
                         {
                             "type": "Column",
                             "width": "stretch",
-                            "items": [{"type": "TextBlock", "text": text, "wrap": "true"}],
+                            "items": [{"type": "TextBlock", "text": text, "wrap": True}],
                         }
                     )
                 container["items"].append(row_json)
@@ -98,8 +98,8 @@ class WebexSender:
         message_content_container = {
             "type": "Container",
             "items": [
-                {"type": "TextBlock", "text": message_content, "wrap": "true"},
-                {"type": "TextBlock", "text": description, "wrap": "true"},
+                {"type": "TextBlock", "text": message_content, "wrap": True},
+                {"type": "TextBlock", "text": description, "wrap": True},
             ],
         }
         return message_content_container