Testing annotation change

Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>

Author: Deydra71

api/bases/neutron.openstack.org_neutronapis.yaml

@@ -1455,6 +1455,28 @@ spec:
                       from the Secret
                     type: string
                 type: object
+              podAnnotations:
+                description: PodAnnotations are added to the Neutron API Deployment
+                  pod template.
+                items:
+                  description: |-
+                    PodAnnotation is a single key/value pair that will be applied to the Neutron API
+                    Deployment PodTemplate as an annotation.
+                  properties:
+                    name:
+                      description: Name is the annotation key.
+                      type: string
+                    value:
+                      description: Value is the annotation value.
+                      type: string
+                  required:
+                  - name
+                  - value
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               preserveJobs:
                 default: false
                 description: PreserveJobs - do not delete jobs after they finished

api/v1beta1/neutronapi_types.go

@@ -177,6 +177,21 @@ type NeutronAPISpecCore struct {
 	// An empty value "" leaves the notification drivers unconfigured and emitting no notifications at all.
 	// Avoid colocating it with RabbitMqClusterName used for RPC.
 	NotificationsBusInstance *string `json:"notificationsBusInstance,omitempty" deprecated:"notificationsBus.cluster"`
+
+	// +kubebuilder:validation:Optional
+	// +listType=map
+	// +listMapKey=name
+	// PodAnnotations are added to the Neutron API Deployment pod template.
+	PodAnnotations []PodAnnotation `json:"podAnnotations,omitempty"`
+}
+
+// PodAnnotation is a single key/value pair that will be applied to the Neutron API
+// Deployment PodTemplate as an annotation.
+type PodAnnotation struct {
+	// Name is the annotation key.
+	Name string `json:"name"`
+	// Value is the annotation value.
+	Value string `json:"value"`
 }
 
 type NeutronApiTLS struct {

api/v1beta1/zz_generated.deepcopy.go

@@ -1455,6 +1455,28 @@ spec:
                       from the Secret
                     type: string
                 type: object
+              podAnnotations:
+                description: PodAnnotations are added to the Neutron API Deployment
+                  pod template.
+                items:
+                  description: |-
+                    PodAnnotation is a single key/value pair that will be applied to the Neutron API
+                    Deployment PodTemplate as an annotation.
+                  properties:
+                    name:
+                      description: Name is the annotation key.
+                      type: string
+                    value:
+                      description: Value is the annotation value.
+                      type: string
+                  required:
+                  - name
+                  - value
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               preserveJobs:
                 default: false
                 description: PreserveJobs - do not delete jobs after they finished

config/crd/bases/neutron.openstack.org_neutronapis.yaml

@@ -134,6 +134,21 @@ func Deployment(
 		apiVolumeMounts = append(apiVolumeMounts, svc.CreateVolumeMounts("ovndb")...)
 	}
 
+	podAnnotations := map[string]string{}
+
+	// keep existing annotations first
+	for k, v := range annotations {
+		podAnnotations[k] = v
+	}
+
+	// overlay user-provided annotations
+	for _, ann := range instance.Spec.PodAnnotations {
+		if ann.Name == "" {
+			continue
+		}
+		podAnnotations[ann.Name] = ann.Value
+	}
+
 	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      ServiceName,
@@ -146,7 +161,7 @@ func Deployment(
 			Replicas: instance.Spec.Replicas,
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Annotations: annotations,
+					Annotations: podAnnotations,
 					Labels:      labels,
 				},
 				Spec: corev1.PodSpec{