Revert "[release-1.35][SRVKS-1301] Update knative/operator to fix webhook issues (#3560)" (#3581)

This reverts commit ac79c86.

Author: dsimansk

go.mod

@@ -29,11 +29,11 @@ require (
 	k8s.io/client-go v0.31.0
 	knative.dev/eventing v0.43.3
 	knative.dev/eventing-kafka-broker v0.37.0
-	knative.dev/hack v0.0.0-20250117112405-6cb0feb3ac46
+	knative.dev/hack v0.0.0-20240814130635-06f7aff93954
 	knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556
-	knative.dev/operator v0.42.11-0.20250319103414-9c594ced1a3a
+	knative.dev/operator v0.42.5
 	knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
-	knative.dev/serving v0.42.2
+	knative.dev/serving v0.42.1
 	sigs.k8s.io/controller-runtime v0.19.0
 	sigs.k8s.io/yaml v1.4.0
 )

go.sum

@@ -2563,8 +2563,8 @@ knative.dev/hack v0.0.0-20240814135050-f9643117f6a1 h1:3l9x2gly9549Mn+HFWlyf+r/m
 knative.dev/hack v0.0.0-20240814135050-f9643117f6a1/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
 knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556 h1:9OTyJkrjiFh/burZiti3WucGv8Qtt91VJTnXfO5dC2g=
 knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556/go.mod h1:1PosUDkXqoHNzYxtLIwa7LFqSsIXBShHOseAb6XBeEU=
-knative.dev/operator v0.42.11-0.20250319103414-9c594ced1a3a h1:myjSxDg9JHFtuCkpO4xjr7JqGMOI8zeXgDJggQVKONI=
-knative.dev/operator v0.42.11-0.20250319103414-9c594ced1a3a/go.mod h1:UKR8MNUPxW+eYF42eCd6sGs8H/q8HXrUAnVDWtFiwJc=
+knative.dev/operator v0.42.5 h1:5sSd60uXx2pt/vVpVsqv5+HQKM09ZGmbk4nnCphDRss=
+knative.dev/operator v0.42.5/go.mod h1:fx8kRLwlk8nh1QErnU3frCsv38dmfheZoHK4j1x86ao=
 knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE=
 knative.dev/pkg v0.0.0-20240716082220-4355f0c73608/go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw=
 knative.dev/reconciler-test v0.0.0-20240716134925-00d94f40c470 h1:cdAPZPUszOYpgJY2LNRzz6lFZgD++U89y56jECV/6eU=

hack/patches/020-backstage_plugins_eventmesh_backend.patch

@@ -94,4 +94,4 @@ index f0d4c777d..f622a4bce 100644
 +		r.handleBackstageResources,
  		manifests.Install,
  		common.CheckDeployments,
- 		common.InstallWebhookConfigs,
+ 		common.DeleteObsoleteResources(ctx, ke, r.installed),

vendor/knative.dev/operator/pkg/reconciler/common/deployments.go

@@ -18,31 +18,15 @@ package common
 
 import (
 	"context"
-	"errors"
 
 	mf "github.com/manifestival/manifestival"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes/scheme"
-
 	"knative.dev/operator/pkg/apis/operator/base"
 )
 
-type deploymentsNotReadyError struct{}
-
-var _ error = deploymentsNotReadyError{}
-
-// Error implements the Error() interface of error.
-func (err deploymentsNotReadyError) Error() string {
-	return "deployments not ready"
-}
-
-// IsDeploymentsNotReadyError returns true if the given error is a deploymentsNotReadyError.
-func IsDeploymentsNotReadyError(err error) bool {
-	return errors.Is(err, deploymentsNotReadyError{})
-}
-
 // CheckDeployments checks all deployments in the given manifest and updates the given
 // status with the status of the deployments.
 func CheckDeployments(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error {
@@ -52,7 +36,7 @@ func CheckDeployments(ctx context.Context, manifest *mf.Manifest, instance base.
 		resource, err := manifest.Client.Get(&u)
 		if err != nil {
 			status.MarkDeploymentsNotReady([]string{"all"})
-			if apierrors.IsNotFound(err) {
+			if errors.IsNotFound(err) {
 				return nil
 			}
 			return err
@@ -68,7 +52,7 @@ func CheckDeployments(ctx context.Context, manifest *mf.Manifest, instance base.
 
 	if len(nonReadyDeployments) > 0 {
 		status.MarkDeploymentsNotReady(nonReadyDeployments)
-		return deploymentsNotReadyError{}
+		return nil
 	}
 
 	status.MarkDeploymentsAvailable()

vendor/knative.dev/operator/pkg/reconciler/common/install.go

@@ -22,20 +22,17 @@ import (
 	"strings"
 
 	mf "github.com/manifestival/manifestival"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"knative.dev/pkg/logging"
 
 	"knative.dev/operator/pkg/apis/operator/base"
 	"knative.dev/operator/pkg/apis/operator/v1beta1"
-	"knative.dev/pkg/logging"
 )
 
 var (
-	role                      mf.Predicate = mf.Any(mf.ByKind("ClusterRole"), mf.ByKind("Role"))
-	rolebinding               mf.Predicate = mf.Any(mf.ByKind("ClusterRoleBinding"), mf.ByKind("RoleBinding"))
-	webhook                   mf.Predicate = mf.Any(mf.ByKind("MutatingWebhookConfiguration"), mf.ByKind("ValidatingWebhookConfiguration"))
-	webhookDependentResources mf.Predicate = byGV(schema.GroupKind{Group: "networking.internal.knative.dev", Kind: "Certificate"})
-	gatewayNotMatch                        = "no matches for kind \"Gateway\""
+	role            mf.Predicate = mf.Any(mf.ByKind("ClusterRole"), mf.ByKind("Role"))
+	rolebinding     mf.Predicate = mf.Any(mf.ByKind("ClusterRoleBinding"), mf.ByKind("RoleBinding"))
+	webhook         mf.Predicate = mf.Any(mf.ByKind("MutatingWebhookConfiguration"), mf.ByKind("ValidatingWebhookConfiguration"))
+	gatewayNotMatch              = "no matches for kind \"Gateway\""
 )
 
 // Install applies the manifest resources for the given version and updates the given
@@ -55,7 +52,7 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen
 		status.MarkInstallFailed(err.Error())
 		return fmt.Errorf("failed to apply (cluster)rolebindings: %w", err)
 	}
-	if err := manifest.Filter(mf.Not(mf.Any(role, rolebinding, webhook, webhookDependentResources))).Apply(); err != nil {
+	if err := manifest.Filter(mf.Not(mf.Any(role, rolebinding, webhook))).Apply(); err != nil {
 		status.MarkInstallFailed(err.Error())
 		if ks, ok := instance.(*v1beta1.KnativeServing); ok && strings.Contains(err.Error(), gatewayNotMatch) &&
 			(ks.Spec.Ingress == nil || ks.Spec.Ingress.Istio.Enabled) {
@@ -66,32 +63,10 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen
 
 		return fmt.Errorf("failed to apply non rbac manifest: %w", err)
 	}
-	return nil
-}
-
-// InstallWebhookConfigs applies the Webhook manifest resources and updates the given status accordingly.
-func InstallWebhookConfigs(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error {
-	status := instance.GetStatus()
 	if err := manifest.Filter(webhook).Apply(); err != nil {
 		status.MarkInstallFailed(err.Error())
 		return fmt.Errorf("failed to apply webhooks: %w", err)
 	}
-	return nil
-}
-
-// InstallWebhookDependentResources applies the Webhook dependent resources updates the given status accordingly.
-func InstallWebhookDependentResources(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error {
-	status := instance.GetStatus()
-	if err := manifest.Filter(webhookDependentResources).Apply(); err != nil {
-		status.MarkInstallFailed(err.Error())
-		return fmt.Errorf("failed to apply webhooks: %w", err)
-	}
-	return nil
-}
-
-// MarkStatusSuccess updates the component status to success.
-func MarkStatusSuccess(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error {
-	status := instance.GetStatus()
 	status.MarkInstallSucceeded()
 	status.SetVersion(TargetVersion(instance))
 	return nil
@@ -108,9 +83,3 @@ func Uninstall(manifest *mf.Manifest) error {
 	}
 	return nil
 }
-
-func byGV(gk schema.GroupKind) mf.Predicate {
-	return func(u *unstructured.Unstructured) bool {
-		return u.GroupVersionKind().GroupKind() == gk
-	}
-}

vendor/knative.dev/operator/pkg/reconciler/common/stages.go

@@ -38,9 +38,6 @@ type Stages []Stage
 func (stages Stages) Execute(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error {
 	for _, stage := range stages {
 		if err := stage(ctx, manifest, instance); err != nil {
-			if IsDeploymentsNotReadyError(err) {
-				break
-			}
 			return err
 		}
 	}

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

@@ -143,9 +143,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent
 		r.handleBackstageResources,
 		manifests.Install,
 		common.CheckDeployments,
-		common.InstallWebhookConfigs,
-		manifests.SetManifestPaths,
-		common.MarkStatusSuccess,
 		common.DeleteObsoleteResources(ctx, ke, r.installed),
 	}
 	manifest := r.manifest.Append()

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

@@ -145,10 +145,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi
 		r.transform,
 		manifests.Install,
 		common.CheckDeployments,
-		common.InstallWebhookConfigs,
-		common.InstallWebhookDependentResources,
-		manifests.SetManifestPaths,
-		common.MarkStatusSuccess,
 		common.DeleteObsoleteResources(ctx, ks, r.installed),
 	}
 	manifest := r.manifest.Append()

vendor/knative.dev/operator/pkg/reconciler/manifests/install.go

@@ -34,11 +34,6 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen
 	if err != nil {
 		return err
 	}
-	return nil
-}
-
-// SetManifestPaths set the manifest paths in the status of the component
-func SetManifestPaths(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error {
 	status := instance.GetStatus()
 	path := common.TargetManifestPathArray(instance)
 	version := common.TargetVersion(instance)

vendor/modules.txt

@@ -1492,7 +1492,7 @@ knative.dev/eventing-kafka-broker/third_party/pkg/client/clientset/versioned
 knative.dev/eventing-kafka-broker/third_party/pkg/client/clientset/versioned/scheme
 knative.dev/eventing-kafka-broker/third_party/pkg/client/clientset/versioned/typed/keda/v1alpha1
 knative.dev/eventing-kafka-broker/third_party/pkg/client/injection/client
-# knative.dev/hack v0.0.0-20250117112405-6cb0feb3ac46 => knative.dev/hack v0.0.0-20240814135050-f9643117f6a1
+# knative.dev/hack v0.0.0-20240814130635-06f7aff93954 => knative.dev/hack v0.0.0-20240814135050-f9643117f6a1
 ## explicit; go 1.18
 knative.dev/hack
 # knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556 => knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556
@@ -1524,7 +1524,7 @@ knative.dev/networking/pkg/http/proxy
 knative.dev/networking/pkg/http/stats
 knative.dev/networking/pkg/ingress
 knative.dev/networking/pkg/k8s
-# knative.dev/operator v0.42.11-0.20250319103414-9c594ced1a3a
+# knative.dev/operator v0.42.5
 ## explicit; go 1.22
 knative.dev/operator/pkg/apis/operator
 knative.dev/operator/pkg/apis/operator/base
@@ -1667,7 +1667,7 @@ knative.dev/reconciler-test/pkg/resources/serviceaccount
 knative.dev/reconciler-test/pkg/state
 knative.dev/reconciler-test/resources/certificate
 knative.dev/reconciler-test/resources/svc
-# knative.dev/serving v0.42.2 => github.com/openshift-knative/serving v0.10.1-0.20240906121033-618992fcbd27
+# knative.dev/serving v0.42.1 => github.com/openshift-knative/serving v0.10.1-0.20240906121033-618992fcbd27
 ## explicit; go 1.22
 knative.dev/serving/pkg/apis/autoscaling
 knative.dev/serving/pkg/apis/autoscaling/v1alpha1