Skip to content

Commit 0fa816c

Browse files
authored
fix: do not remove default config volume when providing additional config (#1480)
fix: do not remove default config volume when providing external config closes #1479 Signed-off-by: Daniel Goldman <[email protected]>
1 parent 891b855 commit 0fa816c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

internal/k8sutils/statefulset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func generateStatefulSetsDef(stsMeta metav1.ObjectMeta, params statefulSetParame
330330
statefulset.Spec.VolumeClaimTemplates = append(statefulset.Spec.VolumeClaimTemplates, createPVCTemplate(pvcTplName, stsMeta, params.PersistentVolumeClaim))
331331
}
332332
if params.ExternalConfig != nil {
333-
statefulset.Spec.Template.Spec.Volumes = getExternalConfig(*params.ExternalConfig)
333+
statefulset.Spec.Template.Spec.Volumes = append(statefulset.Spec.Template.Spec.Volumes, getExternalConfig(*params.ExternalConfig)...)
334334
}
335335
if containerParams.AdditionalVolume != nil {
336336
statefulset.Spec.Template.Spec.Volumes = append(statefulset.Spec.Template.Spec.Volumes, containerParams.AdditionalVolume...)

internal/k8sutils/statefulset_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,6 +1799,12 @@ func TestGenerateStatefulSetsDef(t *testing.T) {
17991799
},
18001800
},
18011801
Volumes: []corev1.Volume{
1802+
{
1803+
Name: "config",
1804+
VolumeSource: corev1.VolumeSource{
1805+
EmptyDir: &corev1.EmptyDirVolumeSource{},
1806+
},
1807+
},
18021808
{
18031809
Name: "external-config",
18041810
VolumeSource: corev1.VolumeSource{

0 commit comments

Comments
 (0)