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

Add additional volume for Kibana logs when hardened security context is enabled #8380

Merged
merged 3 commits into from
Dec 27, 2024
Merged

Add additional volume for Kibana logs when hardened security context is enabled #8380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c6d6ba
Add additional volume for Kibana logs when hardened security context …
naemono Dec 27, 2024
315ba12
Adjust comment
naemono Dec 27, 2024
1b8ecc2
Update wording in pkg/controller/kibana/pod.go
naemono Dec 27, 2024
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
16 changes: 16 additions & 0 deletions pkg/controller/kibana/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,12 @@ func expectedDeploymentParams() deployment.Params {
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
},
{
Name: "kibana-logs",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
},
{
Name: "kibana-plugins",
VolumeSource: corev1.VolumeSource{
Expand Down Expand Up @@ -586,6 +592,11 @@ func expectedDeploymentParams() deployment.Params {
ReadOnly: falseVal,
MountPath: DataVolumeMountPath,
},
{
Name: "kibana-logs",
ReadOnly: falseVal,
MountPath: "/usr/share/kibana/logs",
},
{
Name: "kibana-plugins",
ReadOnly: falseVal,
Expand Down Expand Up @@ -632,6 +643,11 @@ func expectedDeploymentParams() deployment.Params {
ReadOnly: falseVal,
MountPath: DataVolumeMountPath,
},
{
Name: "kibana-logs",
ReadOnly: falseVal,
MountPath: "/usr/share/kibana/logs",
},
{
Name: "kibana-plugins",
ReadOnly: falseVal,
Expand Down
11 changes: 9 additions & 2 deletions pkg/controller/kibana/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const (
DataVolumeMountPath = "/usr/share/kibana/data"
PluginsVolumeName = "kibana-plugins"
PluginsVolumeMountPath = "/usr/share/kibana/plugins"
LogsVolumeName = "kibana-logs"
LogsVolumeMountPath = "/usr/share/kibana/logs"
TempVolumeName = "temp-volume"
TempVolumeMountPath = "/tmp"
KibanaBasePathEnvName = "SERVER_BASEPATH"
Expand All @@ -53,6 +55,10 @@ var (
// the Kibana pod has readOnlyRootFilesystem set to true.
PluginsVolume = volume.NewEmptyDirVolume(PluginsVolumeName, PluginsVolumeMountPath)

// LogsVolume can be used to persist logs even when
// the Kibana pod has readOnlyRootFilesystem set to true.
LogsVolume = volume.NewEmptyDirVolume(LogsVolumeName, LogsVolumeMountPath)

// TempVolume can be used for some reporting features when the Kibana pod has
// readOnlyRootFilesystem set to true.
TempVolume = volume.NewEmptyDirVolume(TempVolumeName, TempVolumeMountPath)
Expand Down Expand Up @@ -143,8 +149,9 @@ func NewPodTemplateSpec(
if v.GTE(version.From(7, 10, 0)) && setDefaultSecurityContext {
builder.WithContainersSecurityContext(defaultSecurityContext).
WithPodSecurityContext(defaultPodSecurityContext).
WithVolumes(TempVolume.Volume()).WithVolumeMounts(TempVolume.VolumeMount()).
WithVolumes(PluginsVolume.Volume()).WithVolumeMounts(PluginsVolume.VolumeMount())
WithVolumes(LogsVolume.Volume()).WithVolumeMounts(LogsVolume.VolumeMount()).
WithVolumes(PluginsVolume.Volume()).WithVolumeMounts(PluginsVolume.VolumeMount()).
WithVolumes(TempVolume.Volume()).WithVolumeMounts(TempVolume.VolumeMount())
}

if keystore != nil {
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/kibana/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ func TestNewPodTemplateSpec(t *testing.T) {
}},
assertions: func(pod corev1.PodTemplateSpec) {
assert.Len(t, pod.Spec.InitContainers, 1)
assert.Len(t, pod.Spec.InitContainers[0].VolumeMounts, 5)
assert.Len(t, pod.Spec.Volumes, 3)
assert.Len(t, GetKibanaContainer(pod.Spec).VolumeMounts, 3)
assert.Len(t, pod.Spec.InitContainers[0].VolumeMounts, 6)
assert.Len(t, pod.Spec.Volumes, 4)
assert.Len(t, GetKibanaContainer(pod.Spec).VolumeMounts, 4)
assert.Equal(t, GetKibanaContainer(pod.Spec).SecurityContext, &defaultSecurityContext)
},
},
Expand Down