Skip to content

Commit

Permalink
Merge pull request #15 from pgoron/sysctl_no_error
Browse files Browse the repository at this point in the history
Change sysctl-budy initContainer image
  • Loading branch information
pgoron authored Mar 25, 2022
2 parents 58f4711 + d13c7a9 commit f7865d5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pkg/controllers/cluster/resource/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,10 @@ func StatefulSetForRack(r scyllav1.RackSpec, c *scyllav1.ScyllaCluster, sidecarI

sysctlContainer := sysctlInitContainer(c.Spec.Sysctls)
if sysctlContainer != nil {
// Override default busybox image for sysctl-buddy container by operator image.
// sysctl command provided by busybox doesn't respect return code of original sysctl.
// When passing -e to ignore unknown settings, busybox sysctl still returns 1 whereas original sysctl returns 0
sysctlContainer.Image = sidecarImage
sts.Spec.Template.Spec.InitContainers = append(sts.Spec.Template.Spec.InitContainers, *sysctlContainer)
}
for _, VolumeMount := range r.VolumeMounts {
Expand Down

0 comments on commit f7865d5

Please sign in to comment.