From fe5e71e9c0a211b38cd2f3415323b22eaa62c7ad Mon Sep 17 00:00:00 2001
From: odubajDT <ondrej.dubaj@dynatrace.com>
Date: Mon, 26 Sep 2022 10:34:07 +0200
Subject: [PATCH] minro fixes

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
---
 operator/deployment.yaml                  |  2 --
 operator/webhooks/pod_mutating_webhook.go | 39 +++++++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/operator/deployment.yaml b/operator/deployment.yaml
index 7096b629027..8792146ad21 100644
--- a/operator/deployment.yaml
+++ b/operator/deployment.yaml
@@ -7,7 +7,6 @@ metadata:
   annotations:
     keptn.sh/application: "application12"
     keptn.sh/service: "service-test"
-    keptn.sh/version: "1.1"
 spec:
   replicas: 3
   selector:
@@ -20,7 +19,6 @@ spec:
       annotations:
         keptn.sh/application: "application12"
         keptn.sh/service: "service-test"
-        keptn.sh/version: "1.1"
     spec:
       containers:
       - name: nginx
diff --git a/operator/webhooks/pod_mutating_webhook.go b/operator/webhooks/pod_mutating_webhook.go
index f69d68c09a9..4e1879d82cf 100644
--- a/operator/webhooks/pod_mutating_webhook.go
+++ b/operator/webhooks/pod_mutating_webhook.go
@@ -137,7 +137,9 @@ func (r *PodMutatingWebhook) handleService(ctx context.Context, logger logr.Logg
 		return nil
 	}
 
-	service = r.generateService(ctx, pod)
+	service.Spec.Version = pod.Annotations[common.VersionAnnotation]
+	service.Spec.ResourceReference = r.getResourceReference(pod)
+	service.Annotations[common.VersionAnnotation] = pod.Annotations[common.VersionAnnotation]
 	err = r.Client.Update(ctx, service)
 	if err != nil {
 		logger.Error(err, "Could not update Service")
@@ -156,16 +158,6 @@ func (r *PodMutatingWebhook) handleService(ctx context.Context, logger logr.Logg
 func (r *PodMutatingWebhook) generateService(ctx context.Context, pod *corev1.Pod) *v1alpha1.Service {
 	version, _ := pod.Annotations[common.VersionAnnotation]
 	applicationName, _ := pod.Annotations[common.ApplicationAnnotation]
-	ownerUID := pod.UID
-	ownerKind := "Pod"
-	if len(pod.OwnerReferences) != 0 {
-		for _, o := range pod.OwnerReferences {
-			if o.Kind == "ReplicaSet" {
-				ownerUID = o.UID
-				ownerKind = o.Kind
-			}
-		}
-	}
 	return &v1alpha1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Annotations: pod.Annotations,
@@ -173,12 +165,9 @@ func (r *PodMutatingWebhook) generateService(ctx context.Context, pod *corev1.Po
 			Namespace:   pod.Namespace,
 		},
 		Spec: v1alpha1.ServiceSpec{
-			ApplicationName: applicationName,
-			Version:         version,
-			ResourceReference: v1alpha1.ResourceReference{
-				UID:  ownerUID,
-				Kind: ownerKind,
-			},
+			ApplicationName:   applicationName,
+			Version:           version,
+			ResourceReference: r.getResourceReference(pod),
 			//for now hardcoded, will be changed in future
 			PreDeploymentCheck: v1alpha1.EventSpec{
 				Service:     r.getServiceName(pod),
@@ -244,3 +233,19 @@ func (r *PodMutatingWebhook) getServiceName(pod *corev1.Pod) string {
 	applicationName, _ := pod.Annotations[common.ApplicationAnnotation]
 	return strings.ToLower(applicationName + "-" + serviceName)
 }
+
+func (r *PodMutatingWebhook) getResourceReference(pod *corev1.Pod) v1alpha1.ResourceReference {
+	reference := v1alpha1.ResourceReference{
+		UID:  pod.UID,
+		Kind: pod.Kind,
+	}
+	if len(pod.OwnerReferences) != 0 {
+		for _, o := range pod.OwnerReferences {
+			if o.Kind == "ReplicaSet" {
+				reference.UID = o.UID
+				reference.Kind = o.Kind
+			}
+		}
+	}
+	return reference
+}