Skip to content

Commit 2b458b8

Browse files
author
smiletan
authored
Merge pull request #436 from ztonny/master
[Enhancement] #435
2 parents 5ca5b25 + 990a375 commit 2b458b8

File tree

1 file changed

+4
-15
lines changed
  • pkg/controller/sub_controller/disaggregated_cluster/metaservice

1 file changed

+4
-15
lines changed

pkg/controller/sub_controller/disaggregated_cluster/metaservice/statefulset.go

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ package metaservice
1919

2020
import (
2121
"context"
22-
"github.com/apache/doris-operator/api/disaggregated/v1"
22+
23+
v1 "github.com/apache/doris-operator/api/disaggregated/v1"
2324
"github.com/apache/doris-operator/pkg/common/utils/k8s"
2425
"github.com/apache/doris-operator/pkg/common/utils/metadata"
2526
"github.com/apache/doris-operator/pkg/common/utils/resource"
@@ -59,19 +60,7 @@ func (dms *DisaggregatedMSController) newStatefulset(ddc *v1.DorisDisaggregatedC
5960

6061
msSpec := ddc.Spec.MetaService
6162
matchLabels := dms.newMSPodsSelector(ddc.Name)
62-
var volumeClaimTemplates []corev1.PersistentVolumeClaim
63-
cpv := msSpec.PersistentVolume
64-
if cpv != nil {
65-
pvc := corev1.PersistentVolumeClaim{
66-
ObjectMeta: metav1.ObjectMeta{
67-
Name: defaultLogPrefixName,
68-
Annotations: resource.NewAnnotations(),
69-
},
70-
Spec: cpv.PersistentVolumeClaimSpec,
71-
}
72-
volumeClaimTemplates = append(volumeClaimTemplates, pvc)
73-
}
74-
63+
_, _, vcts := dms.BuildVolumesVolumeMountsAndPVCs(confMap, v1.DisaggregatedMS, &msSpec.CommonSpec)
7564
replicas := metadata.GetInt32Pointer(v1.DefaultMetaserviceNumber)
7665
if msSpec.Replicas != nil {
7766
replicas = msSpec.Replicas
@@ -84,7 +73,7 @@ func (dms *DisaggregatedMSController) newStatefulset(ddc *v1.DorisDisaggregatedC
8473
}
8574
st.Spec.Template = dms.NewPodTemplateSpec(ddc, matchLabels, confMap)
8675
st.Spec.ServiceName = ddc.GetMSServiceName()
87-
st.Spec.VolumeClaimTemplates = volumeClaimTemplates
76+
st.Spec.VolumeClaimTemplates = vcts
8877
}()
8978

9079
return st

0 commit comments

Comments
 (0)