Merge pull request #12707 from rook/mergify/bp/release-1.12/pr-12698

nfs: run dbus-daemon sidecar as dbus user instead of root (backport #12698)
This commit is contained in:
Blaine Gardner authored and GitHub committed 2023-08-11 17:41:43 -06:00
commit bcd2fe8bd6
1 file changed
+6
+6
View File
@@ -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{
@@ -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,
},
}
}