diff --git a/pkg/controller/certificates/certificate_controller.go b/pkg/controller/certificates/certificate_controller.go index 7bb8b2fdb1a..64798f2ae1c 100644 --- a/pkg/controller/certificates/certificate_controller.go +++ b/pkg/controller/certificates/certificate_controller.go @@ -31,10 +31,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" certificatesinformers "k8s.io/client-go/informers/certificates/v1" clientset "k8s.io/client-go/kubernetes" - v1core "k8s.io/client-go/kubernetes/typed/core/v1" certificateslisters "k8s.io/client-go/listers/certificates/v1" "k8s.io/client-go/tools/cache" - "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/controller" @@ -60,11 +58,6 @@ func NewCertificateController( csrInformer certificatesinformers.CertificateSigningRequestInformer, handler func(context.Context, *certificates.CertificateSigningRequest) error, ) *CertificateController { - // Send events to the apiserver - eventBroadcaster := record.NewBroadcaster() - eventBroadcaster.StartStructuredLogging(0) - eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")}) - cc := &CertificateController{ name: name, kubeClient: kubeClient, diff --git a/test/integration/certificates/duration_test.go b/test/integration/certificates/duration_test.go index 12543e0dedf..e7511a02de6 100644 --- a/test/integration/certificates/duration_test.go +++ b/test/integration/certificates/duration_test.go @@ -51,12 +51,12 @@ import ( func TestCSRDuration(t *testing.T) { t.Parallel() - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) - t.Cleanup(cancel) - s := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) t.Cleanup(s.TearDownFn) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) + t.Cleanup(cancel) + // assert that the metrics we collect during the test run match expectations // we have 7 valid test cases below that request a duration of which 6 should have their duration honored wantMetricStrings := []string{