ddc-skip-default-systeminit

Author: catpineapple

config/crd/bases/crds.yaml

@@ -11361,6 +11361,13 @@ spec:
                     serviceAccount:
                       description: serviceAccount for compute node access cloud service.
                       type: string
+                    skipDefaultSystemInit:
+                      description: |-
+                        SkipDefaultSystemInit is a switch that skips the default initialization and is used to set the default environment configuration required by the doris BE node.
+                        Default value is 'false'.
+                        Default System Init means that the container must be started in privileged mode.
+                        Default System Init configuration is implemented through the initContainers of the pod, so changes to this configuration may be ignored by k8s when it is not the first deployment.
+                      type: boolean
                     startTimeout:
                       description: pod start timeout, unit is second
                       format: int32

config/crd/bases/disaggregated.cluster.doris.com_dorisdisaggregatedclusters.yaml

@@ -2234,6 +2234,13 @@ spec:
                     serviceAccount:
                       description: serviceAccount for compute node access cloud service.
                       type: string
+                    skipDefaultSystemInit:
+                      description: |-
+                        SkipDefaultSystemInit is a switch that skips the default initialization and is used to set the default environment configuration required by the doris BE node.
+                        Default value is 'false'.
+                        Default System Init means that the container must be started in privileged mode.
+                        Default System Init configuration is implemented through the initContainers of the pod, so changes to this configuration may be ignored by k8s when it is not the first deployment.
+                      type: boolean
                     startTimeout:
                       description: pod start timeout, unit is second
                       format: int32

pkg/common/utils/resource/pod.go

@@ -190,7 +190,7 @@ func NewPodTemplateSpec(dcr *v1.DorisCluster, config map[string]interface{}, com
 }
 
 // for disaggregated cluster.
-func NewPodTemplateSpecWithCommonSpec(skipInit bool, cs *dv1.CommonSpec, componentType dv1.DisaggregatedComponentType) corev1.PodTemplateSpec {
+func NewPodTemplateSpecWithCommonSpec(skipDefaultInit bool, cs *dv1.CommonSpec, componentType dv1.DisaggregatedComponentType) corev1.PodTemplateSpec {
 	var vs []corev1.Volume
 	si := cs.SystemInitialization
 	var defaultInitContainers []corev1.Container
@@ -214,7 +214,7 @@ func NewPodTemplateSpecWithCommonSpec(skipInit bool, cs *dv1.CommonSpec, compone
 			Volumes:            vs,
 		},
 	}
-	constructDisaggregatedInitContainers(skipInit, componentType, &pts.Spec, si)
+	constructDisaggregatedInitContainers(skipDefaultInit, componentType, &pts.Spec, si)
 	return pts
 }
 
@@ -264,7 +264,7 @@ func constructInitContainers(skipInit bool, componentType v1.ComponentType, podS
 	podSpec.InitContainers = append(podSpec.InitContainers, defaultInitContains...)
 }
 
-func constructDisaggregatedInitContainers(skipInit bool, componentType dv1.DisaggregatedComponentType, podSpec *corev1.PodSpec, si *dv1.SystemInitialization) {
+func constructDisaggregatedInitContainers(skipDefaultInit bool, componentType dv1.DisaggregatedComponentType, podSpec *corev1.PodSpec, si *dv1.SystemInitialization) {
 	initImage := DEFAULT_INIT_IMAGE
 	var defaultInitContains []corev1.Container
 	if si != nil {
@@ -287,7 +287,7 @@ func constructDisaggregatedInitContainers(skipInit bool, componentType dv1.Disag
 	}
 
 	// the init containers have sequence，should confirm use initial is always in the first priority.
-	if !skipInit && componentType == dv1.DisaggregatedBE {
+	if !skipDefaultInit && componentType == dv1.DisaggregatedBE {
 		podSpec.InitContainers = append(podSpec.InitContainers, constructBeDefaultInitContainer(initImage))
 	}
 	podSpec.InitContainers = append(podSpec.InitContainers, defaultInitContains...)