Skip to content

Commit f3fa7f0

Browse files
committed
fix: Only created /node-conf VolumeMount for clusters
1 parent 0522700 commit f3fa7f0

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

k8sutils/statefulset.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,15 @@ func generateStatefulSetsDef(stsMeta metav1.ObjectMeta, params statefulSetParame
223223
Annotations: generateStatefulSetsAnots(stsMeta),
224224
},
225225
Spec: corev1.PodSpec{
226-
Containers: generateContainerDef(stsMeta.GetName(), containerParams, params.EnableMetrics, params.ExternalConfig, containerParams.AdditionalMountPath, sidecars),
226+
Containers: generateContainerDef(
227+
stsMeta.GetName(),
228+
containerParams,
229+
params.ClusterMode,
230+
params.EnableMetrics,
231+
params.ExternalConfig,
232+
containerParams.AdditionalMountPath,
233+
sidecars,
234+
),
227235
NodeSelector: params.NodeSelector,
228236
SecurityContext: params.PodSecurityContext,
229237
PriorityClassName: params.PriorityClassName,
@@ -353,7 +361,7 @@ func createPVCTemplate(stsMeta metav1.ObjectMeta, storageSpec corev1.PersistentV
353361
}
354362

355363
// generateContainerDef generates container definition for Redis
356-
func generateContainerDef(name string, containerParams containerParameters, enableMetrics bool, externalConfig *string, mountpath []corev1.VolumeMount, sidecars []redisv1beta1.Sidecar) []corev1.Container {
364+
func generateContainerDef(name string, containerParams containerParameters, cluster, enableMetrics bool, externalConfig *string, mountpath []corev1.VolumeMount, sidecars []redisv1beta1.Sidecar) []corev1.Container {
357365
containerDefinition := []corev1.Container{
358366
{
359367
Name: name,
@@ -373,7 +381,7 @@ func generateContainerDef(name string, containerParams containerParameters, enab
373381
),
374382
ReadinessProbe: getProbeInfo(containerParams.ReadinessProbe),
375383
LivenessProbe: getProbeInfo(containerParams.LivenessProbe),
376-
VolumeMounts: getVolumeMount(name, containerParams.PersistenceEnabled, true, externalConfig, mountpath, containerParams.TLSConfig, containerParams.ACLConfig),
384+
VolumeMounts: getVolumeMount(name, containerParams.PersistenceEnabled, cluster, externalConfig, mountpath, containerParams.TLSConfig, containerParams.ACLConfig),
377385
},
378386
}
379387

0 commit comments

Comments
 (0)