Skip to content

Commit

Permalink
Update TAI Operator image
Browse files Browse the repository at this point in the history
  • Loading branch information
@christinaexyou
christinaexyou committed Jan 31, 2025
1 parent ebc1cc4 commit f511f81
Show file tree
Hide file tree
Showing 15 changed files with 555 additions and 480 deletions.
45 changes: 4 additions & 41 deletions api/gorch/v1alpha1/guardrailsorchestrator_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,54 +25,17 @@ import (
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.

type TLSSpec struct {
Type string `json:"type"`
CertPath string `json:"cert_path"`
KeyPath string `json:"key_path"`
CACertPath string `json:"ca_cert_path"`
}

type ServiceSpec struct {
Hostname string `json:"hostname"`
Port int `json:"port"`
TLS TLSSpec `json:"tls,omitempty"`
}

type GeneratorSpec struct {
Provider string `json:"provider"`
Service ServiceSpec `json:"service"`
}

type ChunkerSpec struct {
ChunkerName string `json:"chunkerName"`
Provider string `json:"provider"`
Service ServiceSpec `json:"service"`
}

type DetectorSpec struct {
Name string `json:"name"`
Type string `json:"type"`
Service ServiceSpec `json:"service"`
ChunkerName string `json:"chunkerName"`
DefaultThreshold string `json:"defaultThreshold"`
}

// GuardrailsOrchestratorSpec defines the desired state of GuardrailsOrchestrator.
type GuardrailsOrchestratorSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file

// Number of replicas
Replicas int32 `json:"replicas"`
// CongigMapName string `json:"configMapName"`
// Generator configuration
Generator GeneratorSpec `json:"generator"`
// Chunker configuration
Chunkers []ChunkerSpec `json:"chunkers,omitempty"`
// Detector configuration
Detectors []DetectorSpec `json:"detectors"`
// TLS configuration
TLS string `json:"tls,omitempty"`
// Name of configmap containing generator,detector,and chunker arguments
OrchestratorConfig *string `json:"orchestratorConfig"`
// +optional
VLLMGatewayConfig *string `json:"vllmGatewayConfig,omitempty"`
}

type ConditionType string
Expand Down
96 changes: 8 additions & 88 deletions api/gorch/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/base/params.env
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
trustyaiServiceImage=quay.io/trustyai/trustyai-service:latest
trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
trustyaiOperatorImage=quay.io/christinaexyou/trustyai-service-operator:latest
oauthProxyImage=quay.io/openshift/origin-oauth-proxy:4.14.0
kServeServerless=enabled
lmes-driver-image=quay.io/trustyai/ta-lmes-driver:latest
Expand Down
133 changes: 6 additions & 127 deletions config/crd/bases/trustyai.opendatahub.io_guardrailsorchestrators.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,139 +40,18 @@ spec:
spec:
description: GuardrailsOrchestratorSpec defines the desired state of GuardrailsOrchestrator.
properties:
chunkers:
description: Chunker configuration
items:
properties:
chunkerName:
type: string
provider:
type: string
service:
properties:
hostname:
type: string
port:
type: integer
tls:
properties:
ca_cert_path:
type: string
cert_path:
type: string
key_path:
type: string
type:
type: string
required:
- ca_cert_path
- cert_path
- key_path
- type
type: object
required:
- hostname
- port
type: object
required:
- chunkerName
- provider
- service
type: object
type: array
detectors:
description: Detector configuration
items:
properties:
chunkerName:
type: string
defaultThreshold:
type: string
name:
type: string
service:
properties:
hostname:
type: string
port:
type: integer
tls:
properties:
ca_cert_path:
type: string
cert_path:
type: string
key_path:
type: string
type:
type: string
required:
- ca_cert_path
- cert_path
- key_path
- type
type: object
required:
- hostname
- port
type: object
type:
type: string
required:
- chunkerName
- defaultThreshold
- name
- service
- type
type: object
type: array
generator:
description: |-
CongigMapName string `json:"configMapName"`
Generator configuration
properties:
provider:
type: string
service:
properties:
hostname:
type: string
port:
type: integer
tls:
properties:
ca_cert_path:
type: string
cert_path:
type: string
key_path:
type: string
type:
type: string
required:
- ca_cert_path
- cert_path
- key_path
- type
type: object
required:
- hostname
- port
type: object
required:
- provider
- service
type: object
orchestratorConfig:
description: Name of configmap containing generator,detector,and chunker
arguments
type: string
replicas:
description: Number of replicas
format: int32
type: integer
tls:
description: TLS configuration
vllmGatewayConfig:
type: string
required:
- detectors
- generator
- orchestratorConfig
- replicas
type: object
status:
Expand Down
2 changes: 1 addition & 1 deletion config/overlays/odh/params.env
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
trustyaiServiceImage=quay.io/trustyai/trustyai-service:latest
trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
trustyaiOperatorImage=quay.io/christinaexyou/trustyai-service-operator:latest
oauthProxyImage=quay.io/openshift/origin-oauth-proxy:4.14.0
kServeServerless=enabled
lmes-driver-image=quay.io/trustyai/ta-lmes-driver:latest
Expand Down
2 changes: 1 addition & 1 deletion config/overlays/rhoai/params.env
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
trustyaiServiceImage=quay.io/trustyai/trustyai-service:latest
trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
trustyaiOperatorImage=quay.io/christinaexyou/trustyai-service-operator:latest
oauthProxyImage=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
kServeServerless=enabled
lmes-driver-image=quay.io/trustyai/ta-lmes-driver:latest
Expand Down
Loading

0 comments on commit f511f81

Please sign in to comment.