Revert "Reduce load on the Kubernetes API server and reduce the peak memory use of the cert-manager components by enabling the use of the WatchList (Streaming Lists) feature"

wallrj · cert-manager-bot · commit 514f559594ff · 2024-10-01T16:30:47.000Z
Signed-off-by: Richard Wall &lt;richard.wall@venafi.com&gt;
diff --git a/internal/cainjector/feature/features.go b/internal/cainjector/feature/features.go
@@ -21,9 +21,7 @@ limitations under the License.
 package feature
 
 import (
-	"k8s.io/apimachinery/pkg/util/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	clientfeatures "k8s.io/client-go/features"
 	"k8s.io/component-base/featuregate"
 
 	utilfeature "github.com/cert-manager/cert-manager/pkg/util/feature"
@@ -52,16 +50,6 @@ const (
 
 func init() {
 	utilruntime.Must(utilfeature.DefaultMutableFeatureGate.Add(cainjectorFeatureGates))
-
-	// Register all client-go features with cert-manager's feature gate instance
-	// and make all client-go feature checks use cert-manager's instance. The
-	// effect is that client-go features are wired to the existing
-	// --feature-gates flag just as all other features are. Further, client-go
-	// features automatically support the existing mechanisms for feature
-	// enablement metrics and test overrides.
-	ca := utilfeature.NewClientGoAdapter(utilfeature.DefaultMutableFeatureGate)
-	runtime.Must(clientfeatures.AddFeaturesToExistingFeatureGates(ca))
-	clientfeatures.ReplaceFeatureGates(ca)
 }
 
 // cainjectorFeatureGates defines all feature gates for the cainjector component.
diff --git a/internal/controller/feature/features.go b/internal/controller/feature/features.go
@@ -22,7 +22,6 @@ package feature
 
 import (
 	"k8s.io/apimachinery/pkg/util/runtime"
-	clientfeatures "k8s.io/client-go/features"
 	"k8s.io/component-base/featuregate"
 
 	utilfeature "github.com/cert-manager/cert-manager/pkg/util/feature"
@@ -150,16 +149,6 @@ const (
 
 func init() {
 	runtime.Must(utilfeature.DefaultMutableFeatureGate.Add(defaultCertManagerFeatureGates))
-
-	// Register all client-go features with cert-manager's feature gate instance
-	// and make all client-go feature checks use cert-manager's instance. The
-	// effect is that client-go features are wired to the existing
-	// --feature-gates flag just as all other features are. Further, client-go
-	// features automatically support the existing mechanisms for feature
-	// enablement metrics and test overrides.
-	ca := utilfeature.NewClientGoAdapter(utilfeature.DefaultMutableFeatureGate)
-	runtime.Must(clientfeatures.AddFeaturesToExistingFeatureGates(ca))
-	clientfeatures.ReplaceFeatureGates(ca)
 }
 
 // defaultCertManagerFeatureGates consists of all known cert-manager feature keys.
diff --git a/internal/webhook/feature/features.go b/internal/webhook/feature/features.go
@@ -21,9 +21,7 @@ limitations under the License.
 package feature
 
 import (
-	"k8s.io/apimachinery/pkg/util/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	clientfeatures "k8s.io/client-go/features"
 	"k8s.io/component-base/featuregate"
 
 	utilfeature "github.com/cert-manager/cert-manager/pkg/util/feature"
@@ -86,16 +84,6 @@ const (
 
 func init() {
 	utilruntime.Must(utilfeature.DefaultMutableFeatureGate.Add(webhookFeatureGates))
-
-	// Register all client-go features with cert-manager's feature gate instance
-	// and make all client-go feature checks use cert-manager's instance. The
-	// effect is that client-go features are wired to the existing
-	// --feature-gates flag just as all other features are. Further, client-go
-	// features automatically support the existing mechanisms for feature
-	// enablement metrics and test overrides.
-	ca := utilfeature.NewClientGoAdapter(utilfeature.DefaultMutableFeatureGate)
-	runtime.Must(clientfeatures.AddFeaturesToExistingFeatureGates(ca))
-	clientfeatures.ReplaceFeatureGates(ca)
 }
 
 // webhookFeatureGates defines all feature gates for the webhook component.
diff --git a/make/config/kind/cluster.yaml b/make/config/kind/cluster.yaml
@@ -18,13 +18,6 @@
 
 apiVersion: kind.x-k8s.io/v1alpha4
 kind: Cluster
-featureGates:
-  # Enable the WatchList / Streaming Lists feature on the API server.
-  #
-  # - https://kind.sigs.k8s.io/docs/user/configuration/#feature-gates
-  # - https://kubernetes.io/docs/reference/using-api/api-concepts/#streaming-lists
-  WatchList: true
-
 kubeadmConfigPatches:
   - |
     kind: ClusterConfiguration
@@ -37,4 +30,4 @@ kubeadmConfigPatches:
     networking:
       serviceSubnet: 10.0.0.0/16
 nodes:
-  - role: control-plane
+  - role: control-plane
diff --git a/pkg/util/feature/client_adapter.go b/pkg/util/feature/client_adapter.go
