Merge branch 'fix_logging' into 'master'

Fix log messaging

See merge request rac-docker-dev/oracle-database-operator!257

Author: yunus-qureshi

.gitlab-ci.yml

@@ -5,7 +5,7 @@ build-operator:
     OP_YAML: oracle-database-operator.yaml
   script:
     - go version
-    - echo $CI_COMMIT_TAG
+    - echo $CI_COMMIT_SHORT_SHA
     - make docker-build IMG="$IMAGE"
     - docker push "$IMAGE"
     - newimage=$DOCKER_REPO@$(skopeo inspect docker://$IMAGE |  jq -r .Digest)

controllers/database/singleinstancedatabase_controller.go

@@ -2705,7 +2705,7 @@ func (r *SingleInstanceDatabaseReconciler) cleanupSingleInstanceDatabase(req ctr
 	if m.Status.DgBrokerConfigured {
 		eventReason := "Cannot Delete"
 		eventMsg := "database cannot be deleted as it is present in a DataGuard Broker configuration"
-		r.Recorder.Eventf(m, corev1.EventTypeWarning, eventReason, eventReason)
+		r.Recorder.Eventf(m, corev1.EventTypeWarning, eventReason, eventMsg)
 		return requeueY, errors.New(eventMsg)
 	}