diff --git a/pkg/server/virtual.go b/pkg/server/virtual.go index aae548d3f8c..0ddbdbb4874 100644 --- a/pkg/server/virtual.go +++ b/pkg/server/virtual.go @@ -25,7 +25,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/apiserver/pkg/audit" kaudit "k8s.io/apiserver/pkg/audit" genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/healthz" @@ -101,7 +100,7 @@ func newVirtualConfig( return &VirtualConfig{*c}, nil } -func (c *VirtualConfig) Complete(auth genericapiserver.AuthenticationInfo, auditEvaluator kaudit.PolicyRuleEvaluator, auditBackend audit.Backend, externalAddress string) CompletedVirtualConfig { +func (c *VirtualConfig) Complete(auth genericapiserver.AuthenticationInfo, auditEvaluator kaudit.PolicyRuleEvaluator, auditBackend kaudit.Backend, externalAddress string) CompletedVirtualConfig { if c == nil { return CompletedVirtualConfig{} } diff --git a/tmc/pkg/virtual/syncer/builder/build.go b/tmc/pkg/virtual/syncer/builder/build.go index e8fc4f43593..94d3918745e 100644 --- a/tmc/pkg/virtual/syncer/builder/build.go +++ b/tmc/pkg/virtual/syncer/builder/build.go @@ -30,9 +30,9 @@ import ( "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/virtual/framework/forwardingregistry" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" - apireconciler2 "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/controllers/apireconciler" - transformations2 "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/transformations" - upsyncer2 "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/upsyncer" + "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/controllers/apireconciler" + "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/transformations" + "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/upsyncer" ) const ( @@ -58,13 +58,13 @@ func BuildVirtualWorkspace( indexers.AddIfNotPresentOrDie( cachedKCPInformers.Workload().V1alpha1().SyncTargets().Informer().GetIndexer(), cache.Indexers{ - apireconciler2.IndexSyncTargetsByExport: apireconciler2.IndexSyncTargetsByExports, + apireconciler.IndexSyncTargetsByExport: apireconciler.IndexSyncTargetsByExports, }, ) indexers.AddIfNotPresentOrDie( cachedKCPInformers.Apis().V1alpha1().APIExports().Informer().GetIndexer(), cache.Indexers{ - apireconciler2.IndexAPIExportsByAPIResourceSchema: apireconciler2.IndexAPIExportsByAPIResourceSchemas, + apireconciler.IndexAPIExportsByAPIResourceSchema: apireconciler.IndexAPIExportsByAPIResourceSchemas, }, ) @@ -90,9 +90,9 @@ func BuildVirtualWorkspace( } return true }, - transformer: &transformations2.SyncerResourceTransformer{ - TransformationProvider: &transformations2.SpecDiffTransformation{}, - SummarizingRulesProvider: &transformations2.DefaultSummarizingRules{}, + transformer: &transformations.SyncerResourceTransformer{ + TransformationProvider: &transformations.SpecDiffTransformation{}, + SummarizingRulesProvider: &transformations.DefaultSummarizingRules{}, }, storageWrapperBuilder: forwardingregistry.WithStaticLabelSelector, }).buildVirtualWorkspace(), @@ -110,8 +110,8 @@ func BuildVirtualWorkspace( apiGroupResource.Resource == "pods" || apiGroupResource.Resource == "endpoints") }, - transformer: &upsyncer2.UpsyncerResourceTransformer{}, - storageWrapperBuilder: upsyncer2.WithStaticLabelSelectorAndInWriteCallsCheck, + transformer: &upsyncer.UpsyncerResourceTransformer{}, + storageWrapperBuilder: upsyncer.WithStaticLabelSelectorAndInWriteCallsCheck, }).buildVirtualWorkspace(), }, }