Skip to content
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

Jump to bottom

Set privileged to false unless on OpenShift without CNI #2755

Merged
merged 2 commits into from
Aug 11, 2023
Merged

Set privileged to false unless on OpenShift without CNI #2755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd7decf
Set privileged to false unless on OpenShift without CNI
curtbushko Aug 10, 2023
c690307
add release note
curtbushko Aug 10, 2023
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
3 changes: 3 additions & 0 deletions .changelog/2755.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
control-plane: When using transparent proxy or CNI, reduced required permissions by setting privileged to false. Privileged must be true when using OpenShift without CNI.
```
10 changes: 8 additions & 2 deletions control-plane/connect-inject/webhook/container_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,12 @@ func (w *MeshWebhook) containerInit(namespace corev1.Namespace, pod corev1.Pod,
})
}

// OpenShift without CNI is the only environment where privileged must be true.
privileged := false
if w.EnableOpenShift && !w.EnableCNI {
privileged = true
}

if tproxyEnabled {
if !w.EnableCNI {
// Set redirect traffic config for the container so that we can apply iptables rules.
Expand All @@ -243,7 +249,7 @@ func (w *MeshWebhook) containerInit(namespace corev1.Namespace, pod corev1.Pod,
RunAsGroup: pointer.Int64(rootUserAndGroupID),
// RunAsNonRoot overrides any setting in the Pod so that we can still run as root here as required.
RunAsNonRoot: pointer.Bool(false),
Privileged: pointer.Bool(true),
Privileged: pointer.Bool(privileged),
Capabilities: &corev1.Capabilities{
Add: []corev1.Capability{netAdminCapability},
},
Expand All @@ -253,7 +259,7 @@ func (w *MeshWebhook) containerInit(namespace corev1.Namespace, pod corev1.Pod,
RunAsUser: pointer.Int64(initContainersUserAndGroupID),
RunAsGroup: pointer.Int64(initContainersUserAndGroupID),
RunAsNonRoot: pointer.Bool(true),
Privileged: pointer.Bool(false),
Privileged: pointer.Bool(privileged),
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand Down
57 changes: 45 additions & 12 deletions control-plane/connect-inject/webhook/container_init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,77 +176,104 @@ func TestHandlerContainerInit_transparentProxy(t *testing.T) {
annotations map[string]string
expTproxyEnabled bool
namespaceLabel map[string]string
openShiftEnabled bool
}{
"enabled globally, ns not set, annotation not provided, cni disabled": {
"enabled globally, ns not set, annotation not provided, cni disabled, openshift disabled": {
true,
false,
nil,
true,
nil,
false,
},
"enabled globally, ns not set, annotation is false, cni disabled": {
"enabled globally, ns not set, annotation is false, cni disabled, openshift disabled": {
true,
false,
map[string]string{constants.KeyTransparentProxy: "false"},
false,
nil,
false,
},
"enabled globally, ns not set, annotation is true, cni disabled": {
"enabled globally, ns not set, annotation is true, cni disabled, openshift disabled": {
true,
false,
map[string]string{constants.KeyTransparentProxy: "true"},
true,
nil,
false,
},
"disabled globally, ns not set, annotation not provided, cni disabled": {
"disabled globally, ns not set, annotation not provided, cni disabled, openshift disabled": {
false,
false,
nil,
false,
nil,
false,
},
"disabled globally, ns not set, annotation is false, cni disabled": {
"disabled globally, ns not set, annotation is false, cni disabled, openshift disabled": {
false,
false,
map[string]string{constants.KeyTransparentProxy: "false"},
false,
nil,
false,
},
"disabled globally, ns not set, annotation is true, cni disabled": {
"disabled globally, ns not set, annotation is true, cni disabled, openshift disabled": {
false,
false,
map[string]string{constants.KeyTransparentProxy: "true"},
true,
nil,
false,
},
"disabled globally, ns enabled, annotation not set, cni disabled": {
"disabled globally, ns enabled, annotation not set, cni disabled, openshift disabled": {
false,
false,
nil,
true,
map[string]string{constants.KeyTransparentProxy: "true"},
false,
},
"enabled globally, ns disabled, annotation not set, cni disabled": {
"enabled globally, ns disabled, annotation not set, cni disabled, openshift disabled": {
true,
false,
nil,
false,
map[string]string{constants.KeyTransparentProxy: "false"},
false,
},
"disabled globally, ns enabled, annotation not set, cni enabled": {
"disabled globally, ns enabled, annotation not set, cni enabled, openshift disabled": {
false,
true,
nil,
false,
map[string]string{constants.KeyTransparentProxy: "true"},
false,
},

"enabled globally, ns not set, annotation not set, cni enabled": {
"enabled globally, ns not set, annotation not set, cni enabled, openshift disabled": {
true,
true,
nil,
false,
nil,
false,
},
"enabled globally, ns not set, annotation not set, cni enabled, openshift enabled": {
true,
true,
nil,
false,
nil,
true,
},
"enabled globally, ns not set, annotation not set, cni disabled, openshift enabled": {
true,
false,
nil,
true,
nil,
true,
},
}
for name, c := range cases {
Expand All @@ -255,17 +282,23 @@ func TestHandlerContainerInit_transparentProxy(t *testing.T) {
EnableTransparentProxy: c.globalEnabled,
EnableCNI: c.cniEnabled,
ConsulConfig: &consul.Config{HTTPPort: 8500},
EnableOpenShift: c.openShiftEnabled,
}
pod := minimal()
pod.Annotations = c.annotations

privileged := false
if c.openShiftEnabled && !c.cniEnabled {
privileged = true
}

var expectedSecurityContext *corev1.SecurityContext
if c.cniEnabled {
expectedSecurityContext = &corev1.SecurityContext{
RunAsUser: pointer.Int64(initContainersUserAndGroupID),
RunAsGroup: pointer.Int64(initContainersUserAndGroupID),
RunAsNonRoot: pointer.Bool(true),
Privileged: pointer.Bool(false),
Privileged: pointer.Bool(privileged),
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
},
Expand All @@ -275,7 +308,7 @@ func TestHandlerContainerInit_transparentProxy(t *testing.T) {
RunAsUser: pointer.Int64(0),
RunAsGroup: pointer.Int64(0),
RunAsNonRoot: pointer.Bool(false),
Privileged: pointer.Bool(true),
Privileged: pointer.Bool(privileged),
Capabilities: &corev1.Capabilities{
Add: []corev1.Capability{netAdminCapability},
},
Expand Down