fix nil pointer (#3453)

Co-authored-by: Stavros Kontopoulos <[email protected]>

Author: openshift-cherrypick-robot

hack/patches/022-serving-ingress-ns-filter.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go
-index 4b8eca0b0..0398dfbf9 100644
+index 4b8eca0b0..ccf9f2f67 100644
 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go
 +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go
 @@ -19,14 +19,15 @@ package knativeserving
@@ -20,21 +20,20 @@ index 4b8eca0b0..0398dfbf9 100644
  	"knative.dev/operator/pkg/apis/operator/base"
  	"knative.dev/operator/pkg/apis/operator/v1beta1"
  	clientset "knative.dev/operator/pkg/client/clientset/versioned"
-@@ -86,7 +87,12 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative
- 		logger.Error("Unable to fetch installed manifest; no cluster-scoped resources will be finalized", err)
+@@ -90,6 +91,12 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative
+ 	if manifest == nil {
  		return nil
  	}
--
 +	// we need this to apply the correct namespace to the resources otherwise it defaults to knative-serving
 +	*manifest, err = manifest.Transform(overrideKourierNamespace(original))
 +	if err != nil {
 +		logger.Error("Unable to apply kourier namespace transform", err)
 +		return nil
 +	}
- 	if manifest == nil {
- 		return nil
- 	}
-@@ -97,6 +103,20 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative
+
+ 	if err := common.Uninstall(manifest); err != nil {
+ 		logger.Error("Failed to finalize platform resources", err)
+@@ -97,6 +104,20 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative
  	return nil
  }
 
@@ -55,7 +54,7 @@ index 4b8eca0b0..0398dfbf9 100644
  // ReconcileKind compares the actual state with the desired, and attempts to
  // converge the two.
  func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServing) pkgreconciler.Event {
-@@ -117,6 +137,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi
+@@ -117,6 +138,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi
  		security.AppendTargetSecurity,
  		common.AppendAdditionalManifests,
  		r.appendExtensionManifests,

vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go

@@ -87,15 +87,16 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, original *v1beta1.Knative
 		logger.Error("Unable to fetch installed manifest; no cluster-scoped resources will be finalized", err)
 		return nil
 	}
+
+	if manifest == nil {
+		return nil
+	}
 	// we need this to apply the correct namespace to the resources otherwise it defaults to knative-serving
 	*manifest, err = manifest.Transform(overrideKourierNamespace(original))
 	if err != nil {
 		logger.Error("Unable to apply kourier namespace transform", err)
 		return nil
 	}
-	if manifest == nil {
-		return nil
-	}
 
 	if err := common.Uninstall(manifest); err != nil {
 		logger.Error("Failed to finalize platform resources", err)