Skip to content

Fixes #5

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
markturansky merged 1 commit into from
Nov 10, 2015
Merged

Fixes #5

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
7 changes: 2 additions & 5 deletions images/recycler/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@
#
FROM openshift/origin

RUN yum install -y sudo

# Edit sudoers file
# To avoid error: sudo: sorry, you must have a tty to run sudo
RUN sed -i -e "s/Defaults requiretty.*/ #Defaults requiretty/g" /etc/sudoers
RUN yum install -y sudo && \
sed -i -e "s/Defaults requiretty.*/ #Defaults requiretty/g" /etc/sudoers

ADD scripts/recycler.sh /usr/share/openshift/scripts/volumes/recycler.sh

Expand Down
3 changes: 1 addition & 2 deletions images/recycler/scripts/recycler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ find "${dir}" -type f -print0 | xargs -r -n 1 -0 bash -c 'recycle_file "$@"' {}
function rm_all() {
filename="${1}"
uid=$(stat -c "#%u" "${filename}")
echo "rm_all '${filename}'"
sudo -u "${uid}" rm -rf "${filename}"
}
export -f rm_all

find "${dir}" ! -type d -print0 | xargs -r -n 1 -0 bash -c 'rm_all "$@"' {}

find "${dir}" -mindepth 1 -type d -print0 | sort -z -k 1 -rg | xargs -r -n 1 -0 bash -c 'rm_all "$@"' {}
find "${dir}" -mindepth 1 -type d -print0 | sort -zrg | xargs -r -n 1 -0 bash -c 'rm_all "$@"' {}

echo "Scrub OK"
exit 0
6 changes: 3 additions & 3 deletions pkg/cmd/server/bootstrappolicy/securitycontextconstraints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const (
SecurityContextConstraintNonRootDesc = "nonroot provides all features of the restricted SCC but allows users to run with any non-root UID. The user must specify the UID or it must be specified on the by the manifest of the container runtime."

// SecurityContextConstraintHostMountAndAnyUID is used as the name for the system default host mount + any UID scc.
SecurityContextConstraintHostMountAndAnyUID = "hostmountanyuid"
SecurityContextConstraintHostMountAndAnyUIDDesc = "hostmount provides all the features of the restricted SCC but allows host mounts and any UID by a pod. This is primarily used by the persistent volume recycler. WARNING: this SCC allows host file system access. Grant with caution."
SecurityContextConstraintHostMountAndAnyUID = "hostmount-anyuid"
SecurityContextConstraintHostMountAndAnyUIDDesc = "hostmount-anyuid provides all the features of the restricted SCC but allows host mounts and any UID by a pod. This is primarily used by the persistent volume recycler. WARNING: this SCC allows host file system access as any UID, including UID 0. Grant with caution."

// SecurityContextConstraintHostNS is used as the name for the system default scc
// that grants access to all host ns features.
Expand Down Expand Up @@ -133,7 +133,7 @@ func GetBootstrapSecurityContextConstraints(sccNameToAdditionalGroups map[string
// This strategy requires that annotations on the namespace which will be populated
// by the admission controller. If namespaces are not annotated creating the strategy
// will fail.
Type: kapi.SELinuxStrategyRunAsAny,
Type: kapi.RunAsUserStrategyRunAsAny,
},
FSGroup: kapi.FSGroupStrategyOptions{
// This strategy requires that annotations on the namespace which will be populated
Expand Down