service: correct annotations handling

Author: apetruhin

api/v1/zz_generated.deepcopy.go

@@ -7400,6 +7400,11 @@ spec:
               service:
                 description: Service configuration for Coroot.
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations for the service.
+                    type: object
                   nodePort:
                     description: NodePort number (if type is NodePort).
                     format: int32

config/crd/coroot.com_coroots.yaml

@@ -260,8 +260,9 @@ func (r *CorootReconciler) CreateOrUpdatePVC(ctx context.Context, cr *corootv1.C
 
 func (r *CorootReconciler) CreateOrUpdateService(ctx context.Context, cr *corootv1.Coroot, s *corev1.Service) {
 	spec := s.Spec
+	annotations := s.Annotations
 	r.CreateOrUpdate(ctx, cr, s, false, false, func() error {
-		err := MergeSpecs(s, &s.Spec, spec, nil)
+		err := MergeSpecs(s, &s.Spec, spec, annotations)
 		s.Spec.Ports = spec.Ports
 		return err
 	})
@@ -299,7 +300,7 @@ func (r *CorootReconciler) CreateOrUpdateClusterRoleBinding(ctx context.Context,
 
 func (r *CorootReconciler) CreateOrUpdateIngress(ctx context.Context, cr *corootv1.Coroot, i *networkingv1.Ingress, delete bool) {
 	spec := i.Spec
-	annotations := i.ObjectMeta.Annotations
+	annotations := i.Annotations
 	r.CreateOrUpdate(ctx, cr, i, delete, false, func() error {
 		return MergeSpecs(i, &i.Spec, spec, annotations)
 	})

controller/controller.go

@@ -41,9 +41,10 @@ func (r *CorootReconciler) corootService(cr *corootv1.Coroot) *corev1.Service {
 
 	s := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      fmt.Sprintf("%s-coroot", cr.Name),
-			Namespace: cr.Namespace,
-			Labels:    ls,
+			Name:        fmt.Sprintf("%s-coroot", cr.Name),
+			Namespace:   cr.Namespace,
+			Labels:      ls,
+			Annotations: cr.Spec.Service.Annotations,
 		},
 	}
 
@@ -54,7 +55,6 @@ func (r *CorootReconciler) corootService(cr *corootv1.Coroot) *corev1.Service {
 	s.Spec = corev1.ServiceSpec{
 		Selector: ls,
 		Type:     cr.Spec.Service.Type,
-		Annotations: cr.Spec.Service.Annotations,
 		Ports: []corev1.ServicePort{
 			{
 				Name:       "http",