Skip to content

feat: avoid setting privileged flag if seLinuxOptions is not null #599

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

Merged
merged 4 commits into from
Jun 3, 2021
Merged

feat: avoid setting privileged flag if seLinuxOptions is not null #599

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9151cb2
feat: avoid setting privileged flag if seLinuxOptions is not null
backjo Jun 3, 2021
ec1c7e8
address review comments - add description in README and implement sel…
backjo Jun 3, 2021
bf526e7
fixup! address review comments - add description in README and implem…
mumoshu Jun 3, 2021
7869c7e
Merge branch 'master' into feature/SeLinuxSupport
mumoshu Jun 3, 2021
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
11 changes: 10 additions & 1 deletion controllers/runner_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,14 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
r.GitHubClient.GithubBaseURL,
)

var seLinuxOptions *corev1.SELinuxOptions
if runner.Spec.SecurityContext != nil {
seLinuxOptions = runner.Spec.SecurityContext.SELinuxOptions
if seLinuxOptions != nil {
privileged = false
}
}

pod := corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: runner.Name,
Expand Down Expand Up @@ -821,7 +829,8 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
},
},
SecurityContext: &corev1.SecurityContext{
Privileged: &privileged,
Privileged: &privileged,
SELinuxOptions: seLinuxOptions,
},
Resources: runner.Spec.DockerdContainerResources,
})
Expand Down