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

Use RabbitMQ user for init container instead of root #731

Merged
merged 1 commit into from
Jun 17, 2021
Merged

Use RabbitMQ user for init container instead of root #731

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
19 changes: 2 additions & 17 deletions internal/resource/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,23 +540,8 @@ func (builder *StatefulSetBuilder) podTemplateSpec(previousPodAnnotations map[st
Name: "setup-container",
Image: builder.Instance.Spec.Image,
SecurityContext: &corev1.SecurityContext{
RunAsUser: pointer.Int64Ptr(0),
Capabilities: &corev1.Capabilities{
// drop default set from Docker except for CHOWN, FOWNER, and DAC_OVERRIDE
Drop: []corev1.Capability{
"FSETID",
"KILL",
"SETGID",
"SETUID",
"SETPCAP",
"NET_BIND_SERVICE",
"NET_RAW",
"SYS_CHROOT",
"MKNOD",
"AUDIT_WRITE",
"SETFCAP",
},
},
RunAsGroup: &rabbitmqGID,
RunAsUser: &rabbitmqUID,
},
Command: []string{
"sh", "-c", "cp /tmp/erlang-cookie-secret/.erlang.cookie /var/lib/rabbitmq/.erlang.cookie " +
Expand Down
19 changes: 3 additions & 16 deletions internal/resource/statefulset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,26 +1217,13 @@ var _ = Describe("StatefulSet", func() {
initContainers := statefulSet.Spec.Template.Spec.InitContainers
Expect(initContainers).To(HaveLen(1))

rmqGID, rmqUID := int64(999), int64(999)
initContainer := extractContainer(initContainers, "setup-container")
Expect(initContainer).To(MatchFields(IgnoreExtras, Fields{
"Image": Equal("rabbitmq-image-from-cr"),
"SecurityContext": PointTo(MatchFields(IgnoreExtras, Fields{
"Capabilities": PointTo(MatchAllFields(Fields{
"Drop": ConsistOf([]corev1.Capability{
"FSETID",
"KILL",
"SETGID",
"SETUID",
"SETPCAP",
"NET_BIND_SERVICE",
"NET_RAW",
"SYS_CHROOT",
"MKNOD",
"AUDIT_WRITE",
"SETFCAP",
}),
"Add": BeEmpty(),
})),
"RunAsUser": Equal(&rmqUID),
"RunAsGroup": Equal(&rmqGID),
})),
"Command": ConsistOf(
"sh", "-c", "cp /tmp/erlang-cookie-secret/.erlang.cookie /var/lib/rabbitmq/.erlang.cookie "+
Expand Down