Skip to content

Commit 1e2a3a3

Browse files
committed
fixup
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
1 parent a6d15ce commit 1e2a3a3

File tree

12 files changed

+1587
-187
lines changed

12 files changed

+1587
-187
lines changed

api/v2/checluster_types.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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

889894
type 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"}}}

api/v2/zz_generated.deepcopy.go

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ metadata:
8686
categories: Developer Tools
8787
certified: "false"
8888
containerImage: quay.io/eclipse/che-operator:next
89-
createdAt: "2025-10-02T09:43:55Z"
89+
createdAt: "2025-10-02T14:01:31Z"
9090
description: A Kube-native development solution that delivers portable and collaborative
9191
developer workspaces.
9292
features.operators.openshift.io/cnf: "false"
@@ -108,7 +108,7 @@ metadata:
108108
operatorframework.io/arch.amd64: supported
109109
operatorframework.io/arch.arm64: supported
110110
operatorframework.io/os.linux: supported
111-
name: eclipse-che.v7.110.0-944.next
111+
name: eclipse-che.v7.110.0-945.next
112112
namespace: placeholder
113113
spec:
114114
apiservicedefinitions: {}
@@ -1141,7 +1141,7 @@ spec:
11411141
name: gateway-authorization-sidecar-k8s
11421142
- image: quay.io/che-incubator/header-rewrite-proxy:latest
11431143
name: gateway-header-sidecar
1144-
version: 7.110.0-944.next
1144+
version: 7.110.0-945.next
11451145
webhookdefinitions:
11461146
- admissionReviewVersions:
11471147
- v1

0 commit comments

Comments
 (0)