updating warning message to be more descriptive, add warning event on installplan

Signed-off-by: everettraven <everettraven@gmail.com>

Author: everettraven

pkg/controller/operators/catalog/operator.go

@@ -2322,7 +2322,7 @@ func (o *Operator) ExecutePlan(plan *v1alpha1.InstallPlan) error {
 		o.logger.Errorf("failed to get a client for plan execution- %v", err)
 		return err
 	}
-	b := newBuilder(plan, o.lister.OperatorsV1alpha1().ClusterServiceVersionLister(), builderKubeClient, builderDynamicClient, r, o.logger)
+	b := newBuilder(plan, o.lister.OperatorsV1alpha1().ClusterServiceVersionLister(), builderKubeClient, builderDynamicClient, r, o.logger, o.recorder)
 
 	for i, step := range plan.Status.Plan {
 		if err := func(i int, step *v1alpha1.Step) error {

pkg/controller/operators/catalog/step.go

@@ -7,13 +7,15 @@ import (
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
 	apiextensionsv1beta1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/retry"
 
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -44,18 +46,20 @@ type builder struct {
 	dynamicClient    dynamic.Interface
 	manifestResolver ManifestResolver
 	logger           logrus.FieldLogger
+	eventRecorder    record.EventRecorder
 
 	annotator alongside.Annotator
 }
 
-func newBuilder(plan *v1alpha1.InstallPlan, csvLister listersv1alpha1.ClusterServiceVersionLister, opclient operatorclient.ClientInterface, dynamicClient dynamic.Interface, manifestResolver ManifestResolver, logger logrus.FieldLogger) *builder {
+func newBuilder(plan *v1alpha1.InstallPlan, csvLister listersv1alpha1.ClusterServiceVersionLister, opclient operatorclient.ClientInterface, dynamicClient dynamic.Interface, manifestResolver ManifestResolver, logger logrus.FieldLogger, er record.EventRecorder) *builder {
 	return &builder{
 		plan:             plan,
 		csvLister:        csvLister,
 		opclient:         opclient,
 		dynamicClient:    dynamicClient,
 		manifestResolver: manifestResolver,
 		logger:           logger,
+		eventRecorder:    er,
 	}
 }
 
@@ -141,20 +145,26 @@ func (b *builder) NewCRDV1Step(client apiextensionsv1client.ApiextensionsV1Inter
 					crd.SetResourceVersion(currentCRD.GetResourceVersion())
 					if err = validateV1CRDCompatibility(b.dynamicClient, currentCRD, crd); err != nil {
 						vErr := &validationError{}
-						// if the conversion strategy in the new CRD is "None" OR the error is not a ValidationError
+						// if the conversion strategy in the new CRD is not "Webhook" OR the error is not a ValidationError
 						// return an error. This will catch and return any errors that occur unrelated to actual validation.
 						// For example, the API server returning an error when performing a list operation
-						if crd.Spec.Conversion == nil || crd.Spec.Conversion.Strategy == apiextensionsv1.NoneConverter || !errors.As(err, vErr) {
+						if crd.Spec.Conversion == nil || crd.Spec.Conversion.Strategy != apiextensionsv1.WebhookConverter || !errors.As(err, vErr) {
 							return fmt.Errorf("error validating existing CRs against new CRD's schema for %q: %w", step.Resource.Name, err)
 						}
-						// If the conversion strategy in the new CRD is not "None" and the error that occurred
+						// If the conversion strategy in the new CRD is "Webhook" and the error that occurred
 						// is an error related to validation, warn that validation failed but that we are trusting
 						// that the conversion strategy specified by the author will successfully convert to a format
 						// that passes validation and allow the upgrade to continue
-						b.logger.Warnf("trusting conversion strategy detected in new CRD, but failed validation of existing CRs against new CRD's schema for %q: %s",
-							step.Resource.Name,
-							err.Error(),
-						)
+						warnTempl := `validation of existing CRs against new CRD's schema failed, but a webhook conversion strategy was specified.
+allowing the CRD upgrade to occur as we can't run the webhook, but is assumed that it will successfully convert existing CRs
+to a format that would have passed validation.
+
+CRD: %q
+Validation Error: %s
+`
+						warnString := fmt.Sprintf(warnTempl, step.Resource.Name, err.Error())
+						b.logger.Warn(warnString)
+						b.eventRecorder.Event(b.plan, corev1.EventTypeWarning, "CRDValidation", warnString)
 					}
 
 					// check to see if stored versions changed and whether the upgrade could cause potential data loss