chore: add pod annotation

emqx · Aug 17, 2023 · dd3c7ec · dd3c7ec
1 parent 0946838
commit dd3c7ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/controllers/apps/v2beta1/add_emqx_core.go b/controllers/apps/v2beta1/add_emqx_core.go
@@ -164,7 +164,7 @@ func generateStatefulSet(instance *appsv2beta1.EMQX) *appsv1.StatefulSet {
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:   instance.Namespace,
 			Name:        instance.CoreNamespacedName().Name,
-			Annotations: instance.Spec.CoreTemplate.Annotations,
+			Annotations: instance.Spec.CoreTemplate.DeepCopy().Annotations,
 			Labels:      labels,
 		},
 		Spec: appsv1.StatefulSetSpec{
@@ -176,7 +176,8 @@ func generateStatefulSet(instance *appsv2beta1.EMQX) *appsv1.StatefulSet {
 			PodManagementPolicy: appsv1.ParallelPodManagement,
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: labels,
+					Annotations: instance.Spec.CoreTemplate.DeepCopy().Annotations,
+					Labels:      labels,
 				},
 				Spec: corev1.PodSpec{
 					ReadinessGates: []corev1.PodReadinessGate{

diff --git a/controllers/apps/v2beta1/add_emqx_repl.go b/controllers/apps/v2beta1/add_emqx_repl.go
@@ -170,7 +170,7 @@ func generateReplicaSet(instance *appsv2beta1.EMQX) *appsv1.ReplicaSet {
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:   instance.Namespace,
 			Name:        instance.ReplicantNamespacedName().Name,
-			Annotations: instance.Spec.ReplicantTemplate.Annotations,
+			Annotations: instance.Spec.ReplicantTemplate.DeepCopy().Annotations,
 			Labels:      labels,
 		},
 		Spec: appsv1.ReplicaSetSpec{
@@ -180,7 +180,8 @@ func generateReplicaSet(instance *appsv2beta1.EMQX) *appsv1.ReplicaSet {
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: labels,
+					Annotations: instance.Spec.ReplicantTemplate.DeepCopy().Annotations,
+					Labels:      labels,
 				},
 				Spec: corev1.PodSpec{
 					ReadinessGates: []corev1.PodReadinessGate{