Skip to content

Add CAP_CHOWN when hostUsers: false and procMount: Unmasked #2089

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

Closed
cgruver wants to merge 1 commit into from
Closed

Add CAP_CHOWN when hostUsers: false and procMount: Unmasked #2089

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
2 changes: 1 addition & 1 deletion api/v2/checluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ type ContainerRunConfiguration struct {
// which safely isolates the container's `/proc` from the host. This allows the container
// to modify its own sysctl settings for configuring networking for nested containers.
// +optional
// +kubebuilder:default:={procMount: "Unmasked", allowPrivilegeEscalation: true, capabilities: {add: {"SETGID", "SETUID"}}}
// +kubebuilder:default:={procMount: "Unmasked", allowPrivilegeEscalation: true, capabilities: {add: {"SETGID", "SETUID", "CHOWN"}}}
ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
}

Expand Down
1 change: 1 addition & 0 deletions bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5976,6 +5976,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions bundle/stable/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5976,6 +5976,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions config/crd/bases/org.eclipse.che_checlusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5934,6 +5934,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions deploy/deployment/kubernetes/combined.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5955,6 +5955,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions ...y/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5950,6 +5950,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions deploy/deployment/openshift/combined.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5955,6 +5955,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions ...oy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5950,6 +5950,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5950,6 +5950,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
1 change: 1 addition & 0 deletions helmcharts/stable/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5950,6 +5950,7 @@ spec:
add:
- SETGID
- SETUID
- CHOWN
procMount: Unmasked
description: |-
SecurityContext applied to all workspace containers when run capabilities are enabled.
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/container-capabilities/container_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (r *ContainerRun) getSCCSpec(sccName string) *securityv1.SecurityContextCon
AllowHostPorts: false,
AllowPrivilegeEscalation: pointer.Bool(true),
AllowPrivilegedContainer: false,
AllowedCapabilities: []corev1.Capability{"SETUID", "SETGID"},
AllowedCapabilities: []corev1.Capability{"SETUID", "SETGID", "CHOWN"},
DefaultAddCapabilities: nil,
FSGroup: securityv1.FSGroupStrategyOptions{
Type: securityv1.FSGroupStrategyMustRunAs,
Expand Down
8 changes: 4 additions & 4 deletions pkg/deploy/dev-workspace-config/dev_workspace_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
ContainerSecurityContext: &corev1.SecurityContext{
ProcMount: &unmasked,
Capabilities: &corev1.Capabilities{
Add: []corev1.Capability{"SETUID", "SETGID"},
Add: []corev1.Capability{"SETUID", "SETGID", "CHOWN"},
},
},
},
Expand All @@ -845,7 +845,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
ContainerSecurityContext: &corev1.SecurityContext{
ProcMount: &unmasked,
Capabilities: &corev1.Capabilities{
Add: []corev1.Capability{"SETUID", "SETGID"},
Add: []corev1.Capability{"SETUID", "SETGID", "CHOWN"},
},
},
DeploymentStrategy: "Recreate",
Expand Down Expand Up @@ -961,7 +961,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
ContainerSecurityContext: &corev1.SecurityContext{
ProcMount: &unmasked,
Capabilities: &corev1.Capabilities{
Add: []corev1.Capability{"SETUID", "SETGID"},
Add: []corev1.Capability{"SETUID", "SETGID", "CHOWN"},
},
},
},
Expand All @@ -979,7 +979,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
ContainerSecurityContext: &corev1.SecurityContext{
ProcMount: &unmasked,
Capabilities: &corev1.Capabilities{
Add: []corev1.Capability{"SETUID", "SETGID"},
Add: []corev1.Capability{"SETUID", "SETGID", "CHOWN"},
},
},
DeploymentStrategy: "Recreate",
Expand Down