Merge branch 'main' into pre-commit-ci-update-config

Author: rnetser

class_generator/schema/__resources-mappings.json.gz

@@ -0,0 +1,85 @@
+# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
+
+
+from typing import Any
+
+from ocp_resources.resource import NamespacedResource
+
+
+class EvalHub(NamespacedResource):
+    """
+    EvalHub is the Schema for the evalhubs API
+    """
+
+    api_group: str = NamespacedResource.ApiGroup.TRUSTYAI_OPENDATAHUB_IO
+
+    def __init__(
+        self,
+        collections: list[Any] | None = None,
+        database: dict[str, Any] | None = None,
+        env: list[Any] | None = None,
+        otel: dict[str, Any] | None = None,
+        providers: list[Any] | None = None,
+        replicas: int | None = None,
+        **kwargs: Any,
+    ) -> None:
+        r"""
+        Args:
+            collections (list[Any]): Collections is the list of OOTB collection names to mount into the
+              deployment. Each name must match a collection-name label on a
+              ConfigMap in the operator namespace.
+
+            database (dict[str, Any]): Database configuration for persistent storage. This field is required:
+              the operator will not start the service without an explicit
+              database configuration. Set type to "postgresql" with a secret
+              reference, or "sqlite" for lightweight/development deployments.
+
+            env (list[Any]): Environment variables for the eval-hub container
+
+            otel (dict[str, Any]): OpenTelemetry configuration for observability. When set, the operator
+              includes OTEL settings in the generated config. When omitted, the
+              service uses its defaults (OTEL disabled).
+
+            providers (list[Any]): Providers is the list of OOTB provider names to mount into the
+              deployment. Each name must match a provider-name label on a
+              ConfigMap in the operator namespace.
+
+            replicas (int): Number of replicas for the eval-hub deployment
+
+        """
+        super().__init__(**kwargs)
+
+        self.collections = collections
+        self.database = database
+        self.env = env
+        self.otel = otel
+        self.providers = providers
+        self.replicas = replicas
+
+    def to_dict(self) -> None:
+
+        super().to_dict()
+
+        if not self.kind_dict and not self.yaml_file:
+            self.res["spec"] = {}
+            _spec = self.res["spec"]
+
+            if self.collections is not None:
+                _spec["collections"] = self.collections
+
+            if self.database is not None:
+                _spec["database"] = self.database
+
+            if self.env is not None:
+                _spec["env"] = self.env
+
+            if self.otel is not None:
+                _spec["otel"] = self.otel
+
+            if self.providers is not None:
+                _spec["providers"] = self.providers
+
+            if self.replicas is not None:
+                _spec["replicas"] = self.replicas
+
+    # End of generated code

ocp_resources/evalhub.py

@@ -1,5 +1,6 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
+
 from typing import Any
 
 from ocp_resources.exceptions import MissingRequiredArgumentError
@@ -16,29 +17,43 @@ class GuardrailsOrchestrator(NamespacedResource):
     def __init__(
         self,
         auto_config: dict[str, Any] | None = None,
+        custom_detectors_config: str | None = None,
+        disable_orchestrator: bool | None = None,
         enable_built_in_detectors: bool | None = None,
         enable_guardrails_gateway: bool | None = None,
+        env: list[Any] | None = None,
         guardrails_gateway_config: str | None = None,
         log_level: str | None = None,
         orchestrator_config: str | None = None,
         otel_exporter: dict[str, Any] | None = None,
         replicas: int | None = None,
+        tls_secrets: list[Any] | None = None,
         **kwargs: Any,
     ) -> None:
         r"""
         Args:
             auto_config (dict[str, Any]): Settings governing the automatic configuration of the orchestrator.
               Replaces `OrchestratorConfig`.
 
+            custom_detectors_config (str): Name of configmap containing user-defined Python detectors. This is
+              only used if EnableBuiltInDetectors is true
+
+            disable_orchestrator (bool):  Boolean flag to disable the orchestrator container, if running the
+              built-in detectors in standalone mode
+
             enable_built_in_detectors (bool): Boolean flag to enable/disable built-in detectors
 
             enable_guardrails_gateway (bool): Boolean flag to enable/disable the guardrails sidecar gateway
 
+            env (list[Any]): Define environment variables. These will be added to the orchestrator,
+              gateway, and built-in detector pods.
+
             guardrails_gateway_config (str):  Name of the configmap containing guadrails sidecar gateway arguments
 
             log_level (str): Set log level in the orchestrator deployment
 
-            orchestrator_config (str): Name of configmap containing generator,detector,and chunker arguments
+            orchestrator_config (str): Name of configmap containing generator, detector, and chunker
+              arguments
 
             otel_exporter (dict[str, Any]): List of orchestrator enviroment variables for configuring the OTLP
               exporter
@@ -47,19 +62,27 @@ def __init__(
               Run "make" to regenerate code after modifying this file Number of
               replicas
 
+            tls_secrets (list[Any]): Define TLS secrets to be mounted to the orchestrator. Secrets will be
+              mounted at /etc/tls/$SECRET_NAME
+
         """
         super().__init__(**kwargs)
 
         self.auto_config = auto_config
+        self.custom_detectors_config = custom_detectors_config
+        self.disable_orchestrator = disable_orchestrator
         self.enable_built_in_detectors = enable_built_in_detectors
         self.enable_guardrails_gateway = enable_guardrails_gateway
+        self.env = env
         self.guardrails_gateway_config = guardrails_gateway_config
         self.log_level = log_level
         self.orchestrator_config = orchestrator_config
         self.otel_exporter = otel_exporter
         self.replicas = replicas
+        self.tls_secrets = tls_secrets
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:
@@ -74,12 +97,21 @@ def to_dict(self) -> None:
             if self.auto_config is not None:
                 _spec["autoConfig"] = self.auto_config
 
+            if self.custom_detectors_config is not None:
+                _spec["customDetectorsConfig"] = self.custom_detectors_config
+
+            if self.disable_orchestrator is not None:
+                _spec["disableOrchestrator"] = self.disable_orchestrator
+
             if self.enable_built_in_detectors is not None:
                 _spec["enableBuiltInDetectors"] = self.enable_built_in_detectors
 
             if self.enable_guardrails_gateway is not None:
                 _spec["enableGuardrailsGateway"] = self.enable_guardrails_gateway
 
+            if self.env is not None:
+                _spec["env"] = self.env
+
             if self.guardrails_gateway_config is not None:
                 _spec["guardrailsGatewayConfig"] = self.guardrails_gateway_config
 
@@ -92,4 +124,7 @@ def to_dict(self) -> None:
             if self.otel_exporter is not None:
                 _spec["otelExporter"] = self.otel_exporter
 
+            if self.tls_secrets is not None:
+                _spec["tlsSecrets"] = self.tls_secrets
+
     # End of generated code

ocp_resources/guardrails_orchestrator.py

@@ -16,23 +16,28 @@ class LlamaStackDistribution(NamespacedResource):
 
     def __init__(
         self,
+        network: dict[str, Any] | None = None,
         replicas: int | None = None,
         server: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         r"""
         Args:
+            network (dict[str, Any]): Network defines network access controls for the LlamaStack service
+
             replicas (int): No field description from API
 
             server (dict[str, Any]): ServerSpec defines the desired state of llama server.
 
         """
         super().__init__(**kwargs)
 
+        self.network = network
         self.replicas = replicas
         self.server = server
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:
@@ -44,6 +49,9 @@ def to_dict(self) -> None:
 
             _spec["server"] = self.server
 
+            if self.network is not None:
+                _spec["network"] = self.network
+
             if self.replicas is not None:
                 _spec["replicas"] = self.replicas
 

ocp_resources/llama_stack_distribution.py

@@ -98,6 +98,7 @@ def __init__(
         self.task_list = task_list
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file: