@@ -152,7 +152,8 @@ type CheClusterDevEnvironments struct {
152152 // +optional
153153 DisableContainerBuildCapabilities * bool `json:"disableContainerBuildCapabilities,omitempty"`
154154 // Disables container run capabilities.
155- // If set to `false`, the value from `devEnvironments.security.containerSecurityContext`
155+ // Can be enabled on OpenShift version 4.20 or later.
156+ // When set to `false`, the value from `devEnvironments.security.containerSecurityContext`
156157 // is ignored, and instead the SecurityContext defined in
157158 // `devEnvironments.containerRunConfiguration.containerSecurityContext` is applied.
158159 // +optional
@@ -884,6 +885,10 @@ type ContainerBuildConfiguration struct {
884885 // +kubebuilder:validation:Required
885886 // +kubebuilder:default:=container-build
886887 OpenShiftSecurityContextConstraint string `json:"openShiftSecurityContextConstraint,omitempty"`
888+ // SecurityContext applied to all workspace containers when build capabilities are enabled.
889+ // +optional
890+ // +kubebuilder:default:={allowPrivilegeEscalation: true, capabilities: {add: {"SETGID", "SETUID"}}}
891+ ContainerSecurityContext * corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
887892}
888893
889894type ContainerRunConfiguration struct {
@@ -895,7 +900,7 @@ type ContainerRunConfiguration struct {
895900 // in addition to those defined in `devEnvironments.workspacePodAnnotations`.
896901 // +optional
897902 // +kubebuilder:default:={"io.kubernetes.cri-o.Devices": "/dev/fuse,/dev/net/tun"}
898- ExtraWorkspacePodAnnotations map [string ]string `json:"extraWorkspacePodAnnotations ,omitempty"`
903+ WorkspacesPodAnnotations map [string ]string `json:"workspacesPodAnnotations ,omitempty"`
899904 // SecurityContext applied to all workspace containers when run capabilities are enabled.
900905 // +optional
901906 // +kubebuilder:default:={procMount: "Unmasked", allowPrivilegeEscalation: false, capabilities: {add: {"SETGID", "SETUID"}}}
0 commit comments