Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions api/doris/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ type FeSpec struct {
//the number of fe in election. electionNumber <= replicas, left as observers. default value=3
ElectionNumber *int32 `json:"electionNumber,omitempty"`

// VolumeMounts is the extral volume mounts for fe pod.
VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`

// Volumes is the extral volumes for fe pod.
Volumes []corev1.Volume `json:"volumes,omitempty"`

// InitContainers is the extral init containers for fe pod.
InitContainers []corev1.Container `json:"initContainers,omitempty"`

//the foundation spec for creating be software services.
BaseSpec `json:",inline"`
}
Expand Down
21 changes: 21 additions & 0 deletions api/doris/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,872 changes: 1,872 additions & 0 deletions config/crd/bases/crds.yaml

Large diffs are not rendered by default.

1,872 changes: 1,872 additions & 0 deletions config/crd/bases/doris.apache.com_dorisclusters.yaml

Large diffs are not rendered by default.

1,872 changes: 1,872 additions & 0 deletions config/crd/bases/doris.selectdb.com_dorisclusters.yaml

Large diffs are not rendered by default.

1,872 changes: 1,872 additions & 0 deletions helm-charts/doris-operator/crds/doris.apache.com_dorisclusters.yaml

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions helm-charts/doris/templates/doriscluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,18 @@ spec:
secrets:
{{- toYaml .Values.feSpec.secrets | nindent 4 }}
{{- end }}
{{- if .Values.feSpec.volumes }}
volumes:
{{- toYaml .Values.feSpec.volumes | nindent 4 }}
{{- end }}
{{- if .Values.feSpec.volumeMounts }}
volumeMounts:
{{- toYaml .Values.feSpec.volumeMounts | nindent 4 }}
{{- end }}
{{- if .Values.feSpec.initContainers }}
initContainers:
{{- toYaml .Values.feSpec.initContainers | nindent 4 }}
{{- end }}
{{- if .Values.feSpec.persistentVolumeClaim }}
persistentVolumes:
{{- template "doriscluster.fe.pvc" . }}
Expand Down
21 changes: 21 additions & 0 deletions helm-charts/doris/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,27 @@ feSpec:
# - secretName: my-secret
# mountPath: /etc/doris

# volumes allows adding extra volumes to fe pods.
volumes: []
# - name: fe-extra-volume
# secret:
# secretName: my-secret

# volumeMounts allows adding extra volume mounts to the fe container.
volumeMounts: []
# - name: fe-extra-volume
# mountPath: /etc/fe-extra
# readOnly: true

# initContainers allows adding extra init containers to fe pods.
initContainers: []
# - name: fe-extra-init
# image: busybox:latest
# command: ["/bin/sh", "-c", "echo init"]
# volumeMounts:
# - name: fe-extra-volume
# mountPath: /etc/fe-extra

persistentVolumeClaim: {}
# meta volume, mountPath is /opt/apache-doris/fe/doris-meta
# metaPersistentVolume:
Expand Down
4 changes: 4 additions & 0 deletions pkg/controller/sub_controller/fe/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ func (fc *Controller) buildFEPodTemplateSpec(dcr *v1.DorisCluster, config map[st
feContainer := fc.feContainer(dcr, config)
containers = append(containers, feContainer)
containers = resource.ApplySecurityContext(containers, dcr.Spec.FeSpec.ContainerSecurityContext)
podTemplateSpec.Spec.InitContainers = append(podTemplateSpec.Spec.InitContainers, dcr.Spec.FeSpec.InitContainers...)
podTemplateSpec.Spec.Containers = containers
podTemplateSpec.Spec.Volumes = append(podTemplateSpec.Spec.Volumes, dcr.Spec.FeSpec.Volumes...)
return podTemplateSpec
}

Expand Down Expand Up @@ -65,5 +67,7 @@ func (fc *Controller) feContainer(dcr *v1.DorisCluster, config map[string]interf
Value: strconv.FormatInt(int64(ele), 10),
})

c.VolumeMounts = append(c.VolumeMounts, dcr.Spec.FeSpec.VolumeMounts...)

return c
}