Add Operand version to DeprecatedOperandVersion event

infinispan · May 22, 2024 · 4ca5194 · 4ca5194
1 parent 957c8b8
commit 4ca5194
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/api/v1/infinispan_webhook.go b/api/v1/infinispan_webhook.go
@@ -241,9 +241,9 @@ func (i *Infinispan) validate() error {
 	operand, err := versionManager.WithRef(i.Spec.Version)
 	if err != nil {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("version"), i.Spec.Version, err.Error()))
-	}
-	if operand.Deprecated {
-		eventRec.Event(i, corev1.EventTypeWarning, "DeprecatedOperandVersion", "Configured Infinispan version will be removed in a subsequent Operator release. You must upgrade to a non-deprecated release before upgrading the Operator.")
+	} else if operand.Deprecated {
+		msg := fmt.Sprintf("Infinispan version '%s' will be removed in a subsequent Operator release. You must upgrade to a non-deprecated release before upgrading the Operator.", i.Spec.Version)
+		eventRec.Event(i, corev1.EventTypeWarning, "DeprecatedOperandVersion", msg)
 	}
 
 	if i.Spec.Container.CPU != "" {