From 7e5034394107b860f5d179e127d010207d3fdc90 Mon Sep 17 00:00:00 2001
From: Danny Zaken <dannyzaken@gmail.com>
Date: Sun, 27 Oct 2019 14:58:19 +0200
Subject: [PATCH] changed CustomImage event to NooBaaImage event for every
 image change

---
 pkg/system/phase1_verifying.go |  9 ---------
 pkg/system/phase2_creating.go  | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkg/system/phase1_verifying.go b/pkg/system/phase1_verifying.go
index 149fdc9c0..36f0b0507 100644
--- a/pkg/system/phase1_verifying.go
+++ b/pkg/system/phase1_verifying.go
@@ -8,7 +8,6 @@ import (
 	nbv1 "github.com/noobaa/noobaa-operator/v2/pkg/apis/noobaa/v1alpha1"
 	"github.com/noobaa/noobaa-operator/v2/pkg/options"
 	"github.com/noobaa/noobaa-operator/v2/pkg/util"
-	corev1 "k8s.io/api/core/v1"
 )
 
 // ReconcilePhaseVerifying runs the reconcile verify phase
@@ -84,17 +83,9 @@ func (r *Reconciler) CheckSystemCR() error {
 			}
 		} else {
 			log.Infof("Using custom image %q contraints %q", imageRef.String(), ContainerImageConstraint.String())
-			if r.Recorder != nil {
-				r.Recorder.Eventf(r.NooBaa, corev1.EventTypeNormal,
-					"CustomImage", `Custom image version requested %q, I hope you know what you're doing ...`, imageRef)
-			}
 		}
 	} else {
 		log.Infof("Using custom image name %q the default is %q", imageRef.String(), options.ContainerImageName)
-		if r.Recorder != nil {
-			r.Recorder.Eventf(r.NooBaa, corev1.EventTypeNormal,
-				"CustomImage", `Custom image requested %q, I hope you know what you're doing ...`, imageRef)
-		}
 	}
 
 	// Set ActualImage to be updated in the noobaa status
diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go
index f87aa2b8e..778cc2f62 100644
--- a/pkg/system/phase2_creating.go
+++ b/pkg/system/phase2_creating.go
@@ -70,6 +70,7 @@ func (r *Reconciler) SetDesiredCoreApp() {
 
 	podSpec := &r.CoreApp.Spec.Template.Spec
 	podSpec.ServiceAccountName = "noobaa"
+	coreImageChanged := false
 	for i := range podSpec.InitContainers {
 		c := &podSpec.InitContainers[i]
 		switch c.Name {
@@ -81,7 +82,10 @@ func (r *Reconciler) SetDesiredCoreApp() {
 		c := &podSpec.Containers[i]
 		switch c.Name {
 		case "core":
-			c.Image = r.NooBaa.Status.ActualImage
+			if c.Image != r.NooBaa.Status.ActualImage {
+				coreImageChanged = true
+				c.Image = r.NooBaa.Status.ActualImage
+			}
 			for j := range c.Env {
 				switch c.Env[j].Name {
 				// case "ENDPOINT_FORKS_NUMBER":
@@ -132,6 +136,12 @@ func (r *Reconciler) SetDesiredCoreApp() {
 				}
 			}
 		}
+
+		// generate info event for the first creation of noobaa
+		if r.Recorder != nil {
+			r.Recorder.Eventf(r.NooBaa, corev1.EventTypeNormal,
+				"NooBaaImage", `Using NooBaa image %q for the creation of %q`, r.NooBaa.Status.ActualImage, r.NooBaa.Name)
+		}
 	} else {
 		// when already exists we check that there is no update requested to the volumes
 		// otherwise we report that volume update is unsupported
@@ -162,6 +172,15 @@ func (r *Reconciler) SetDesiredCoreApp() {
 				}
 			}
 		}
+
+		if coreImageChanged {
+			// generate info event for the first creation of noobaa
+			if r.Recorder != nil {
+				r.Recorder.Eventf(r.NooBaa, corev1.EventTypeNormal,
+					"NooBaaImage", `Updating NooBaa image to %q for %q`, r.NooBaa.Status.ActualImage, r.NooBaa.Name)
+			}
+		}
+
 	}
 }