Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@ type WorkspaceConfig struct {
// the value "0" should be used. By default, the memory limit is 128Mi and the memory request is 64Mi.
// No CPU limit or request is added by default.
DefaultContainerResources *corev1.ResourceRequirements `json:"defaultContainerResources,omitempty"`
// ContainerResourceCaps defines the maximum resource requirements enforced for workspace
// containers. If a container specifies limits or requests that exceed these values, they
// will be capped at the maximum. Note: Caps only apply when resources are already specified
// on a container. For containers without resource specifications, use DefaultContainerResources
// instead. These resource caps do not apply to initContainers or the projectClone container.
ContainerResourceCaps *corev1.ResourceRequirements `json:"containerResourceCaps,omitempty"`
// PodAnnotations defines the metadata.annotations for DevWorkspace pods created by the DevWorkspace Operator.
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
// RuntimeClassName defines the spec.runtimeClassName for DevWorkspace pods created by the DevWorkspace Operator.
Expand Down
5 changes: 5 additions & 0 deletions apis/controller/v1alpha1/zz_generated.deepcopy.go

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

1 change: 1 addition & 0 deletions controllers/workspace/devworkspace_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
workspace.Config.Workspace.ContainerSecurityContext,
workspace.Config.Workspace.ImagePullPolicy,
workspace.Config.Workspace.DefaultContainerResources,
workspace.Config.Workspace.ContainerResourceCaps,
workspace.Config.Workspace.PostStartTimeout,
postStartDebugTrapSleepDuration,
)
Expand Down

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

64 changes: 64 additions & 0 deletions deploy/deployment/kubernetes/combined.yaml

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

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

64 changes: 64 additions & 0 deletions deploy/deployment/openshift/combined.yaml

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

Loading
Loading