Skip to content

streamlining deployment config #1193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blublinsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

streamlining deployment config #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 44 additions & 52 deletions api/v1alpha1/olsconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,74 +295,58 @@ type LimiterConfig struct {

// DeploymentConfig defines the schema for overriding deployment of OLS instance.
type DeploymentConfig struct {
// Defines the number of desired OLS pods. Default: "1"
// +kubebuilder:default=1
// +kubebuilder:validation:Minimum=0
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Number of replicas",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:podCount"}
Replicas *int32 `json:"replicas,omitempty"`
// API container settings.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="API Container"
APIContainer APIContainerConfig `json:"api,omitempty"`
APIContainer PodDeploymentConfig `json:"api,omitempty"`
// Data Collector container settings.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Data Collector Container"
DataCollectorContainer DataCollectorContainerConfig `json:"dataCollector,omitempty"`
DataCollectorContainer ContainerConfig `json:"dataCollector,omitempty"`
// MCP server container settings.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="MCP Server Container"
MCPServerContainer ContainerConfig `json:"mcpServer,omitempty"`
// Llama Stack container settings.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Llama Stack Container"
LlamaStackContainer ContainerConfig `json:"llamaStack,omitempty"`
// Console container settings.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Console Container"
ConsoleContainer ConsoleContainerConfig `json:"console,omitempty"`
ConsoleContainer PodDeploymentConfig `json:"console,omitempty"`
// Database container settings.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Database Container"
DatabaseContainer DatabaseContainerConfig `json:"database,omitempty"`
// MCP server container settings.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="MCP Server Container"
MCPServerContainer MCPServerContainerConfig `json:"mcpServer,omitempty"`
DatabaseContainer PodDeploymentConfig `json:"database,omitempty"`
}

type APIContainerConfig struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Resource Requirements",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:resourceRequirements"}
// PodDeploymentConfig defines pod configuration using standard Kubernetes types
type PodDeploymentConfig struct {
// Defines the number of desired OLS pods. Default: "1"
// +kubebuilder:default=1
// +kubebuilder:validation:Minimum=0
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Number of replicas",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:podCount"}
Replicas *int32 `json:"replicas,omitempty"`
// Resource requirements (CPU, memory)
// Uses standard corev1.ResourceRequirements
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Tolerations",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:tolerations"}

// Tolerations for pod scheduling
// Uses standard corev1.Toleration
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Node Selector",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:nodeSelector"}
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
}

type DataCollectorContainerConfig struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Resource Requirements",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:resourceRequirements"}
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
}
// Node selector constraints
NodeSelector map[string]string `json:"nodeSelector,omitempty"`

type MCPServerContainerConfig struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Resource Requirements",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:resourceRequirements"}
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
}
// Affinity rules (can be added without API version bump)
// Uses standard corev1.Affinity
Affinity *corev1.Affinity `json:"affinity,omitempty"`

type ConsoleContainerConfig struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Resource Requirements",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:resourceRequirements"}
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Tolerations",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:tolerations"}
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Node Selector",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:nodeSelector"}
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
// Defines the number of desired Console pods. Default: "1"
// +kubebuilder:default=1
// +kubebuilder:validation:Minimum=0
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Number of replicas",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:podCount"}
// +optional
Replicas *int32 `json:"replicas,omitempty"`
// Certificate Authority (CA) certificate used by the console proxy endpoint.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CA Certificate",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:caCertificate"}
// +kubebuilder:validation:Pattern=`^-----BEGIN CERTIFICATE-----([\s\S]*)-----END CERTIFICATE-----\s?$`
// +optional
CAcertificate string `json:"caCertificate,omitempty"`
// Topology spread constraints (can be added without API version bump)
// Uses standard corev1.TopologySpreadConstraint
TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
}

type DatabaseContainerConfig struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Resource Requirements",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:resourceRequirements"}
// ContainerConfig defines container configuration using standard Kubernetes types
type ContainerConfig struct {
// Resource requirements (CPU, memory)
// Uses standard corev1.ResourceRequirements
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Tolerations",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:tolerations"}
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Node Selector",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:nodeSelector"}
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
}

// +kubebuilder:validation:Enum=postgres
Expand Down Expand Up @@ -499,8 +483,16 @@ type OLSDataCollectorSpec struct {
}

type TLSConfig struct {
// KeySecretRef is the secret that holds the TLS key.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Key Secret"
// KeyCertSecretRef references a Secret containing TLS certificate and key.
// The Secret must contain the following keys:
// - tls.crt: Server certificate (PEM format) - REQUIRED
// - tls.key: Private key (PEM format) - REQUIRED
// - ca.crt: CA certificate for console proxy trust (PEM format) - OPTIONAL
//
// If ca.crt is not provided, the OpenShift Console proxy will use the default system trust store.
//
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="TLS Certificate Secret Reference"
// +optional
KeyCertSecretRef corev1.LocalObjectReference `json:"keyCertSecretRef,omitempty"`
}

Expand Down
194 changes: 57 additions & 137 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ LABEL summary="Red Hat OpenShift Lightspeed"
LABEL com.redhat.openshift.versions=v4.16-v4.20

# Set user to non-root for security reasons.
USER 1001
USER 1001
Loading