Skip to content

Commit

Permalink
Fix: Wrong association of the volumeMounts to Sentinel
Browse files Browse the repository at this point in the history
  • Loading branch information
samof76 committed Sep 13, 2022
1 parent 82b3224 commit 7abd4bc
Show file tree
Hide file tree
Showing 2 changed files with 157 additions and 5 deletions.
10 changes: 5 additions & 5 deletions operator/redisfailover/service/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ func getSentinelVolumeMounts(rf *redisfailoverv1.RedisFailover) []corev1.VolumeM
}

if rf.Spec.Sentinel.ExtraVolumeMounts != nil {
volumeMounts = append(volumeMounts, rf.Spec.Redis.ExtraVolumeMounts...)
volumeMounts = append(volumeMounts, rf.Spec.Sentinel.ExtraVolumeMounts...)
}

return volumeMounts
Expand Down Expand Up @@ -840,15 +840,15 @@ func getRedisVolumes(rf *redisfailoverv1.RedisFailover) []corev1.Volume {
},
}

if rf.Spec.Redis.ExtraVolumes != nil {
volumes = append(volumes, rf.Spec.Redis.ExtraVolumes...)
}

dataVolume := getRedisDataVolume(rf)
if dataVolume != nil {
volumes = append(volumes, *dataVolume)
}

if rf.Spec.Redis.ExtraVolumes != nil {
volumes = append(volumes, rf.Spec.Redis.ExtraVolumes...)
}

return volumes
}

Expand Down
152 changes: 152 additions & 0 deletions operator/redisfailover/service/generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1484,3 +1484,155 @@ func TestSentinelImagePullPolicy(t *testing.T) {
assert.Equal(string(test.expectedConfigPolicy), string(configPolicy))
}
}

func TestRedisExtraVolumeMounts(t *testing.T) {

mode := int32(755)
tests := []struct {
name string
expectedVolumes []corev1.Volume
expectedVolumeMounts []corev1.VolumeMount
}{
{
name: "EmptyDir",
expectedVolumes: []corev1.Volume{
{
Name: "foo",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
},
},
expectedVolumeMounts: []corev1.VolumeMount{
{
Name: "foo",
MountPath: "/mnt/foo",
},
},
},
{
name: "ConfigMap",
expectedVolumes: []corev1.Volume{
{
Name: "bar",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: "bar-cm",
},
DefaultMode: &mode,
},
},
},
},
expectedVolumeMounts: []corev1.VolumeMount{
{
Name: "bar",
MountPath: "/mnt/scripts",
},
},
},
}

for _, test := range tests {
assert := assert.New(t)

var extraVolume corev1.Volume
var extraVolumeMount corev1.VolumeMount

rf := generateRF()
rf.Spec.Redis.ExtraVolumes = test.expectedVolumes
rf.Spec.Redis.ExtraVolumeMounts = test.expectedVolumeMounts

ms := &mK8SService.Services{}
ms.On("CreateOrUpdatePodDisruptionBudget", namespace, mock.Anything).Once().Return(nil, nil)
ms.On("CreateOrUpdateStatefulSet", namespace, mock.Anything).Once().Run(func(args mock.Arguments) {
s := args.Get(1).(*appsv1.StatefulSet)
extraVolume = s.Spec.Template.Spec.Volumes[3]
extraVolumeMount = s.Spec.Template.Spec.Containers[0].VolumeMounts[4]
}).Return(nil)

client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy)
err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})

assert.NoError(err)
assert.Equal(test.expectedVolumes[0], extraVolume)
assert.Equal(test.expectedVolumeMounts[0], extraVolumeMount)
}
}

func TestSentinelExtraVolumeMounts(t *testing.T) {

mode := int32(755)
tests := []struct {
name string
expectedVolumes []corev1.Volume
expectedVolumeMounts []corev1.VolumeMount
}{
{
name: "EmptyDir",
expectedVolumes: []corev1.Volume{
{
Name: "foo",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
},
},
expectedVolumeMounts: []corev1.VolumeMount{
{
Name: "foo",
MountPath: "/mnt/foo",
},
},
},
{
name: "ConfigMap",
expectedVolumes: []corev1.Volume{
{
Name: "bar",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: "bar-cm",
},
DefaultMode: &mode,
},
},
},
},
expectedVolumeMounts: []corev1.VolumeMount{
{
Name: "bar",
MountPath: "/mnt/scripts",
},
},
},
}

for _, test := range tests {
assert := assert.New(t)

var extraVolume corev1.Volume
var extraVolumeMount corev1.VolumeMount

rf := generateRF()
rf.Spec.Sentinel.ExtraVolumes = test.expectedVolumes
rf.Spec.Sentinel.ExtraVolumeMounts = test.expectedVolumeMounts

ms := &mK8SService.Services{}
ms.On("CreateOrUpdatePodDisruptionBudget", namespace, mock.Anything).Once().Return(nil, nil)
ms.On("CreateOrUpdateDeployment", namespace, mock.Anything).Once().Run(func(args mock.Arguments) {
d := args.Get(1).(*appsv1.Deployment)
extraVolume = d.Spec.Template.Spec.Volumes[2]
extraVolumeMount = d.Spec.Template.Spec.Containers[0].VolumeMounts[1]
}).Return(nil)

client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy)
err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})

assert.NoError(err)
assert.Equal(test.expectedVolumes[0], extraVolume)
assert.Equal(test.expectedVolumeMounts[0], extraVolumeMount)
}
}

0 comments on commit 7abd4bc

Please sign in to comment.