Add podAnnotations field to CRDs and types for Broker, Controller, an…

…d NameService This commit introduces a new field, podAnnotations, to the CRDs and corresponding types for Broker, Controller, and NameService. This allows users to specify annotations for the pods created by these resources, enhancing customization and configuration options for deployments. Signed-off-by: yangw <[email protected]>
apache · Dec 12, 2024 · 3e53c49 · 3e53c49
1 parent 9752d8c
commit 3e53c49
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 7 deletions.
diff --git a/charts/rocketmq-operator/crds/rocketmq.apache.org_brokers.yaml b/charts/rocketmq-operator/crds/rocketmq.apache.org_brokers.yaml
@@ -1171,6 +1171,11 @@ spec:
                 description: NodeSelector is a selector which must be true for the
                   pod to fit on a node
                 type: object
+              podAnnotations:
+                additionalProperties:
+                  type: string
+                description: Pod Annotations
+                type: object
               priorityClassName:
                 description: PriorityClassName indicates the pod's priority
                 type: string

diff --git a/charts/rocketmq-operator/crds/rocketmq.apache.org_controllers.yaml b/charts/rocketmq-operator/crds/rocketmq.apache.org_controllers.yaml
@@ -1149,6 +1149,11 @@ spec:
                 description: NodeSelector is a selector which must be true for the
                   pod to fit on a node
                 type: object
+              podAnnotations:
+                additionalProperties:
+                  type: string
+                description: Pod Annotations
+                type: object
               priorityClassName:
                 description: PriorityClassName indicates the pod's priority
                 type: string

diff --git a/charts/rocketmq-operator/crds/rocketmq.apache.org_nameservices.yaml b/charts/rocketmq-operator/crds/rocketmq.apache.org_nameservices.yaml
@@ -1158,6 +1158,11 @@ spec:
                 description: NodeSelector is a selector which must be true for the
                   pod to fit on a node
                 type: object
+              podAnnotations:
+                additionalProperties:
+                  type: string
+                description: Pod Annotations
+                type: object
               priorityClassName:
                 description: PriorityClassName indicates the pod's priority
                 type: string

diff --git a/deploy/crds/rocketmq.apache.org_brokers.yaml b/deploy/crds/rocketmq.apache.org_brokers.yaml
@@ -1171,6 +1171,11 @@ spec:
                 description: NodeSelector is a selector which must be true for the
                   pod to fit on a node
                 type: object
+              podAnnotations:
+                additionalProperties:
+                  type: string
+                description: Pod Annotations
+                type: object
               priorityClassName:
                 description: PriorityClassName indicates the pod's priority
                 type: string

diff --git a/deploy/crds/rocketmq.apache.org_controllers.yaml b/deploy/crds/rocketmq.apache.org_controllers.yaml
@@ -1149,6 +1149,11 @@ spec:
                 description: NodeSelector is a selector which must be true for the
                   pod to fit on a node
                 type: object
+              podAnnotations:
+                additionalProperties:
+                  type: string
+                description: Pod Annotations
+                type: object
               priorityClassName:
                 description: PriorityClassName indicates the pod's priority
                 type: string

diff --git a/deploy/crds/rocketmq.apache.org_nameservices.yaml b/deploy/crds/rocketmq.apache.org_nameservices.yaml
@@ -1158,6 +1158,11 @@ spec:
                 description: NodeSelector is a selector which must be true for the
                   pod to fit on a node
                 type: object
+              podAnnotations:
+                additionalProperties:
+                  type: string
+                description: Pod Annotations
+                type: object
               priorityClassName:
                 description: PriorityClassName indicates the pod's priority
                 type: string

diff --git a/pkg/apis/rocketmq/v1alpha1/broker_types.go b/pkg/apis/rocketmq/v1alpha1/broker_types.go
@@ -66,6 +66,8 @@ type BrokerSpec struct {
 	ScalePodName string `json:"scalePodName"`
 	// Pod Security Context
 	PodSecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
+	// Pod Annotations
+	PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
 	// Container Security Context
 	ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
 	// The secrets used to pull image from private registry

diff --git a/pkg/apis/rocketmq/v1alpha1/controller_types.go b/pkg/apis/rocketmq/v1alpha1/controller_types.go
@@ -54,6 +54,8 @@ type ControllerSpec struct {
 
 	// Pod Security Context
 	PodSecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
+	// Pod Annotations
+	PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
 	// Container Security Context
 	ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
 	// The secrets used to pull image from private registry

diff --git a/pkg/apis/rocketmq/v1alpha1/nameservice_types.go b/pkg/apis/rocketmq/v1alpha1/nameservice_types.go
@@ -53,6 +53,8 @@ type NameServiceSpec struct {
 	VolumeClaimTemplates []corev1.PersistentVolumeClaim `json:"volumeClaimTemplates"`
 	// Pod Security Context
 	PodSecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
+	// Pod Annotations
+	PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
 	// Container Security Context
 	ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
 	// The secrets used to pull image from private registry

diff --git a/pkg/apis/rocketmq/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/rocketmq/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/broker/broker_controller.go b/pkg/controller/broker/broker_controller.go
@@ -449,7 +449,8 @@ func (r *ReconcileBroker) getBrokerStatefulSet(broker *rocketmqv1alpha1.Broker,
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: ls,
+					Labels:      ls,
+					Annotations: broker.Spec.PodAnnotations,
 				},
 				Spec: corev1.PodSpec{
 					ServiceAccountName: broker.Spec.ServiceAccountName,

diff --git a/pkg/controller/console/console_controller.go b/pkg/controller/console/console_controller.go
@@ -20,6 +20,9 @@ package console
 import (
 	"context"
 	"fmt"
+	"reflect"
+	"time"
+
 	rocketmqv1alpha1 "github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
 	cons "github.com/apache/rocketmq-operator/pkg/constants"
 	"github.com/apache/rocketmq-operator/pkg/share"
@@ -29,7 +32,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"reflect"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -38,7 +40,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
-	"time"
 )
 
 var log = logf.Log.WithName("controller_console")
@@ -201,7 +202,8 @@ func newDeploymentForCR(cr *rocketmqv1alpha1.Console) *appsv1.Deployment {
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: cr.Spec.ConsoleDeployment.Spec.Template.ObjectMeta.Labels,
+					Labels:      cr.Spec.ConsoleDeployment.Spec.Template.ObjectMeta.Labels,
+					Annotations: cr.Spec.ConsoleDeployment.Spec.Template.ObjectMeta.Annotations,
 				},
 				Spec: corev1.PodSpec{
 					ServiceAccountName: cr.Spec.ConsoleDeployment.Spec.Template.Spec.ServiceAccountName,

diff --git a/pkg/controller/controller/dledger_controller.go b/pkg/controller/controller/dledger_controller.go
@@ -257,7 +257,8 @@ func (r *ReconcileController) getControllerStatefulSet(controller *rocketmqv1alp
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: ls,
+					Labels:      ls,
+					Annotations: controller.Spec.PodAnnotations,
 				},
 				Spec: corev1.PodSpec{
 

diff --git a/pkg/controller/nameservice/nameservice_controller.go b/pkg/controller/nameservice/nameservice_controller.go
@@ -20,14 +20,15 @@ package nameservice
 
 import (
 	"context"
-	"github.com/google/uuid"
 	"os/exec"
 	"reflect"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
+
 	rocketmqv1alpha1 "github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
 	cons "github.com/apache/rocketmq-operator/pkg/constants"
 	"github.com/apache/rocketmq-operator/pkg/share"
@@ -357,7 +358,8 @@ func (r *ReconcileNameService) statefulSetForNameService(nameService *rocketmqv1
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: ls,
+					Labels:      ls,
+					Annotations: nameService.Spec.PodAnnotations,
 				},
 				Spec: corev1.PodSpec{
 					ServiceAccountName: nameService.Spec.ServiceAccountName,