Merge pull request #31 from Al-assad/dev

Support customize annotations for Doris components.
linsoss · Nov 30, 2023 · a4fc9e4 · a4fc9e4
2 parents 0153459 + 69f6b48
commit a4fc9e4
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 9 deletions.
diff --git a/api/v1beta1/doriscluster_types.go b/api/v1beta1/doriscluster_types.go
@@ -86,6 +86,10 @@ type DorisClusterSpec struct {
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 
+	// Annotations of the Doris cluster.
+	// +optional
+	Annotations map[string]string `json:"annotations,omitempty"`
+
 	// Tolerations are applied to Doris cluster pods, allowing pods to be scheduled onto nodes with matching taints.
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
@@ -240,6 +244,10 @@ type DorisComponentSpec struct {
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 
+	// Annotations of the component.
+	// +optional
+	Annotations map[string]string `json:"annotations,omitempty"`
+
 	// Affinity for pod scheduling of Doris cluster.
 	// +optional
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/al-assad.github.io_dorisclusters.yaml b/config/crd/bases/al-assad.github.io_dorisclusters.yaml
@@ -393,6 +393,10 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                type: object
               be:
                 properties:
                   additionalContainers:
@@ -2173,6 +2177,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -4059,6 +4067,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -5922,6 +5934,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -7783,6 +7799,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:

diff --git a/internal/transformer/be_resources.go b/internal/transformer/be_resources.go
@@ -289,11 +289,16 @@ func MakeBeStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1.Sta
 		hostAlias = cr.Spec.BE.HostAliases
 	}
 
+	// pod templateL annotations
+	podAnnotations := util.MergeMaps(cr.Annotations, cr.Spec.BE.Annotations)
+	metricsAnnotations := MakePrometheusAnnotations("/metrics", GetBeWebserverPort(cr))
+	podAnnotations = util.MergeMaps(metricsAnnotations, podAnnotations)
+
 	// pod template
 	podTemplate := corev1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels:      beLabels,
-			Annotations: MakePrometheusAnnotations("/metrics", GetBeWebserverPort(cr)),
+			Annotations: podAnnotations,
 		},
 		Spec: corev1.PodSpec{
 			Volumes:            volumes,

diff --git a/internal/transformer/broker_resources.go b/internal/transformer/broker_resources.go
@@ -205,7 +205,7 @@ func MakeBrokerStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1
 	podTemplate := corev1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels:      brokerLabels,
-			Annotations: make(map[string]string),
+			Annotations: util.MergeMaps(cr.Annotations, cr.Spec.Broker.Annotations),
 		},
 		Spec: corev1.PodSpec{
 			Volumes:            volumes,

diff --git a/internal/transformer/cn_resources.go b/internal/transformer/cn_resources.go
@@ -269,11 +269,16 @@ func MakeCnStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1.Sta
 		hostAlias = cr.Spec.CN.HostAliases
 	}
 
+	// pod templateL annotations
+	podAnnotations := util.MergeMaps(cr.Annotations, cr.Spec.CN.Annotations)
+	metricsAnnotations := MakePrometheusAnnotations("/metrics", GetCnWebserverPort(cr))
+	podAnnotations = util.MergeMaps(metricsAnnotations, podAnnotations)
+
 	// pod template
 	podTemplate := corev1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels:      cnLabels,
-			Annotations: MakePrometheusAnnotations("/metrics", GetBeWebserverPort(cr)),
+			Annotations: podAnnotations,
 		},
 		Spec: corev1.PodSpec{
 			Volumes:            volumes,

diff --git a/internal/transformer/fe_resources.go b/internal/transformer/fe_resources.go
@@ -304,15 +304,20 @@ func MakeFeStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1.Sta
 		hostAlias = cr.Spec.FE.HostAliases
 	}
 
+	// pod template: annotation
+	podAnnotations := util.MergeMaps(cr.Annotations, cr.Spec.FE.Annotations)
+	metricsAnnotations := map[string]string{
+		PrometheusPathAnnoKey:   "/metrics",
+		PrometheusPortAnnoKey:   strconv.Itoa(int(GetFeHttpPort(cr))),
+		PrometheusScrapeAnnoKey: "true",
+	}
+	podAnnotations = util.MergeMaps(metricsAnnotations, podAnnotations)
+
 	// pod template
 	podTemplate := corev1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
-			Labels: feLabels,
-			Annotations: map[string]string{
-				PrometheusPathAnnoKey:   "/metrics",
-				PrometheusPortAnnoKey:   strconv.Itoa(int(GetFeHttpPort(cr))),
-				PrometheusScrapeAnnoKey: "true",
-			},
+			Labels:      feLabels,
+			Annotations: podAnnotations,
 		},
 		Spec: corev1.PodSpec{
 			Volumes:            volumes,