fix decorator test

Author: mjudeikis

pkg/authorization/decorator_test.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	auditapis "k8s.io/apiserver/pkg/apis/audit"
 	"k8s.io/apiserver/pkg/audit"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 )
@@ -218,17 +217,14 @@ func TestDecorator(t *testing.T) {
 	} {
 		t.Run(name, func(t *testing.T) {
 			ctx := audit.WithAuditContext(context.Background())
-			auditCtx := audit.AuditContextFrom(ctx)
-			auditCtx.Event = auditapis.Event{
-				Level: auditapis.LevelMetadata,
-			}
+
 			attr := authorizer.AttributesRecord{}
 			dec, reason, _ := tc.authz.Authorize(ctx, attr)
 			if dec != tc.wantDecision {
 				t.Errorf("want decision %v got %v", tc.wantDecision, dec)
 			}
-			ev := audit.AuditEventFrom(ctx)
-			if diff := cmp.Diff(tc.wantAudit, ev.Annotations); diff != "" {
+			ev := audit.AuditContextFrom(ctx)
+			if diff := cmp.Diff(tc.wantAudit, ev.GetEventAnnotations()); diff != "" {
 				t.Errorf("audit log annotations differ: %v", diff)
 			}
 			if tc.wantReason != reason {

pkg/features/kcp_features.go

@@ -68,7 +68,7 @@ var DefaultFeatureGate = utilfeature.DefaultFeatureGate
 func init() {
 	utilruntime.Must(utilfeature.DefaultMutableFeatureGate.AddVersioned(defaultVersionedGenericControlPlaneFeatureGates))
 
-	disableFeatures()
+	utilruntime.Must(disableFeatures())
 }
 
 func KnownFeatures() []string {
@@ -163,13 +163,17 @@ var defaultVersionedGenericControlPlaneFeatureGates = map[featuregate.Feature]fe
 }
 
 // disableFeatures sets features that kcp wants disabled/enabled by default.
-func disableFeatures() {
+func disableFeatures() error {
 	toDisable := map[featuregate.Feature]bool{
 		// We disable SizeBasedListCostEstimate by default in kcp as stats collector does not have cluster awarness yet.
 		// We add this here to track changes in future k8s releases.
 		genericfeatures.SizeBasedListCostEstimate: false,
 	}
 	for f, v := range toDisable {
-		utilfeature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=%v", f, v))
+		err := utilfeature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=%v", f, v))
+		if err != nil {
+			return err
+		}
 	}
+	return nil
 }