Skip to content

Commit

Permalink
Merge pull request rook#12707 from rook/mergify/bp/release-1.12/pr-12698
Browse files Browse the repository at this point in the history
nfs: run dbus-daemon sidecar as dbus user instead of root (backport rook#12698)
  • Loading branch information
BlaineEXE authored Aug 11, 2023
2 parents 660d43c + 6afe22a commit bcd2fe8
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/operator/ceph/nfs/spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ func (r *ReconcileCephNFS) daemonContainer(nfs *cephv1.CephNFS, cfg daemonConfig
func (r *ReconcileCephNFS) dbusContainer(nfs *cephv1.CephNFS) v1.Container {
_, dbusMount := dbusVolumeAndMount()

// uid of the "dbus" user in most (all?) Linux distributions
dbusUID := int64(81)

return v1.Container{
Name: "dbus-daemon",
Command: []string{
Expand All @@ -270,6 +273,9 @@ func (r *ReconcileCephNFS) dbusContainer(nfs *cephv1.CephNFS) v1.Container {
},
Env: k8sutil.ClusterDaemonEnvVars(r.cephClusterSpec.CephVersion.Image), // do not need access to Ceph env vars b/c not a Ceph daemon
Resources: nfs.Spec.Server.Resources,
SecurityContext: &v1.SecurityContext{
RunAsUser: &dbusUID,
},
}
}

Expand Down

0 comments on commit bcd2fe8

Please sign in to comment.