Address initial reviews

On-behalf-of: @SAP [email protected]
Signed-off-by: Marko Mudrinić <[email protected]>

Author: xmudrii

cmd/virtual-workspaces/command/cmd.go

@@ -44,7 +44,6 @@ import (
 	kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
 	"github.com/kcp-dev/kcp/pkg/server/bootstrap"
 	virtualrootapiserver "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver"
-	virtualoptions "github.com/kcp-dev/kcp/pkg/virtual/options"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions"
 )
@@ -179,8 +178,7 @@ func Run(ctx context.Context, o *options.Options) error {
 		return err
 	}
 
-	admissionOptions := virtualoptions.NewAdmission()
-	if err := admissionOptions.ApplyTo(&recommendedConfig.Config, func() []virtualrootapiserver.NamedVirtualWorkspace {
+	if err := o.VirtualWorkspaceAdmission.ApplyTo(&recommendedConfig.Config, func() []virtualrootapiserver.NamedVirtualWorkspace {
 		return rootAPIServerConfig.Extra.VirtualWorkspaces
 	}); err != nil {
 		return err

cmd/virtual-workspaces/options/options.go

@@ -55,7 +55,8 @@ type Options struct {
 
 	Logs *logs.Options
 
-	CoreVirtualWorkspaces corevwoptions.Options
+	CoreVirtualWorkspaces     corevwoptions.Options
+	VirtualWorkspaceAdmission corevwoptions.Admission
 
 	ProfilerAddress string
 }
@@ -74,8 +75,9 @@ func NewOptions() *Options {
 		Audit:          *genericapiserveroptions.NewAuditOptions(),
 		Logs:           logs.NewOptions(),
 
-		CoreVirtualWorkspaces: *corevwoptions.NewOptions(),
-		ProfilerAddress:       "",
+		CoreVirtualWorkspaces:     *corevwoptions.NewOptions(),
+		VirtualWorkspaceAdmission: *corevwoptions.NewAdmission(),
+		ProfilerAddress:           "",
 	}
 
 	opts.SecureServing.ServerCert.CertKey.CertFile = filepath.Join(".", ".kcp", "apiserver.crt")

pkg/virtual/framework/admission/mutatingwebhook/plugin.go

@@ -31,7 +31,7 @@ import (
 )
 
 const (
-	PluginName = "apis.kcp.io/VWMutatingWebhook"
+	PluginName = "apis.kcp.io/VirtualWorkspaceMutatingWebhook"
 )
 
 type Plugin struct {

pkg/virtual/framework/admission/validatingwebhook/plugin.go

@@ -31,7 +31,7 @@ import (
 )
 
 const (
-	PluginName = "apis.kcp.io/qqqqqq"
+	PluginName = "apis.kcp.io/VirtualWorkspaceValidatingWebhook"
 )
 
 type Plugin struct {

pkg/virtual/options/admission.go

@@ -22,6 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/admission"
+	admissionmetrics "k8s.io/apiserver/pkg/admission/metrics"
 	apiserverapi "k8s.io/apiserver/pkg/apis/apiserver"
 	apiserverapiv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
 	apiserverapiv1alpha1 "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1"
@@ -73,7 +74,7 @@ func (s *Admission) ApplyTo(config *genericapiserver.Config, virtualWorkspaces f
 		return err
 	}
 
-	// config.AdmissionControl = admissionmetrics.WithStepMetrics(admissionChain)
-	config.AdmissionControl = admissionChain
+	config.AdmissionControl = admissionmetrics.WithStepMetrics(admissionChain)
+
 	return nil
 }