refactor: extract core pkg (#100)

## What type of PR is this?
/kind refactor

## What this PR does / why we need it:
Extract the `core` pkg:
* `pkg/core/server` -> starter for CoreServer
* `pkg/core/manager` -> domain layer for CoreServer
* `pkg/core/handler` -> web layer for CoreServer

Author: elliotxx

.github/CODEOWNERS

@@ -6,7 +6,7 @@
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
 # * @global-owner1 @global-owner2
-* @elliotxx @panshuai-ps @adohe
+* @elliotxx @panshuai-ps @adohe @ffforest
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only
@@ -24,13 +24,13 @@
 # explicit write access to the repository. In this example,
 # the octocats team in the octo-org organization owns all .txt files.
 # *.txt @octo-org/octocats
-*.go @elliotxx @panshuai-ps @adohe
+*.go @elliotxx @panshuai-ps @adohe @ffforest
 
 # In this example, @doctocat owns any files in the build/logs
 # directory at the root of the repository and any of its
 # subdirectories.
 # /build/logs/ @doctocat
-/.github/ @elliotxx @panshuai-ps @adohe
+/.github/ @elliotxx @panshuai-ps @adohe @ffforest
 
 # The `docs/*` pattern will match files like
 # `docs/getting-started.md` but not further nested files like
@@ -45,7 +45,7 @@
 # directory in the root of your repository and any of its
 # subdirectories.
 # /docs/ @doctocat
-/docs/ @elliotxx @panshuai-ps @adohe
+/docs/ @elliotxx @panshuai-ps @adohe @ffforest
 
 # In this example, @octocat owns any file in the `/apps`
 # directory in the root of your repository except for the `/apps/github`

go.mod

@@ -27,6 +27,7 @@ require (
 	k8s.io/component-base v0.26.0
 	k8s.io/klog/v2 v2.80.1
 	k8s.io/kube-openapi v0.0.0-20230106171958-10e5f0effbd2
+	k8s.io/metrics v0.26.0
 	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3
 	sigs.k8s.io/yaml v1.3.0
@@ -124,7 +125,6 @@ require (
 	k8s.io/apiextensions-apiserver v0.23.5 // indirect
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kms v0.26.0 // indirect
-	k8s.io/metrics v0.26.0 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 )

pkg/apiserver/apiserver.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/KusionStack/karbour/pkg/core/server"
 	"github.com/KusionStack/karbour/pkg/registry"
 	clusterstorage "github.com/KusionStack/karbour/pkg/registry/cluster"
 	searchstorage "github.com/KusionStack/karbour/pkg/registry/search"
@@ -82,7 +83,7 @@ func (s *KarbourServer) InstallCoreServer(c *CompletedConfig) *KarbourServer {
 	}
 
 	// Create the core server.
-	s.mux = NewCoreServer(c)
+	s.mux = server.NewCoreServer(&c.GenericConfig, c.ExtraConfig)
 
 	// Mount the core mux to NonGoRestfulMux of GenericAPIServer.
 	s.GenericAPIServer.Handler.NonGoRestfulMux.HandlePrefix("/", s.mux)

pkg/handler/cluster/cluster.go renamed to pkg/core/handler/cluster/cluster.go

@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/KusionStack/karbour/pkg/manager/cluster"
+	"github.com/KusionStack/karbour/pkg/core/manager/cluster"
 	"github.com/KusionStack/karbour/pkg/multicluster"
 	"github.com/go-chi/chi/v5"
 	"k8s.io/apiserver/pkg/server"

pkg/handler/config/config.go renamed to pkg/core/handler/config/config.go

@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/KusionStack/karbour/pkg/manager/config"
+	"github.com/KusionStack/karbour/pkg/core/manager/config"
 	"github.com/KusionStack/karbour/pkg/util/ctxutil"
 )
 

pkg/handler/resource/resource.go renamed to pkg/core/handler/resource/resource.go

@@ -19,7 +19,7 @@ import (
 	"net/http"
 
 	"github.com/KusionStack/karbour/pkg/apis/search"
-	"github.com/KusionStack/karbour/pkg/manager/resource"
+	"github.com/KusionStack/karbour/pkg/core/manager/resource"
 	"github.com/KusionStack/karbour/pkg/multicluster"
 	"github.com/KusionStack/karbour/pkg/registry"
 	searchstorage "github.com/KusionStack/karbour/pkg/registry/search"

pkg/manager/cluster/manager.go renamed to pkg/core/manager/cluster/manager.go

@@ -12,25 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package apiserver
+package server
 
 import (
 	"fmt"
 	"net/http"
 	"strings"
 
-	clusterhandler "github.com/KusionStack/karbour/pkg/handler/cluster"
-	confighandler "github.com/KusionStack/karbour/pkg/handler/config"
-	resourcehandler "github.com/KusionStack/karbour/pkg/handler/resource"
-	clustermanager "github.com/KusionStack/karbour/pkg/manager/cluster"
-	"github.com/KusionStack/karbour/pkg/manager/config"
-	resourcemanager "github.com/KusionStack/karbour/pkg/manager/resource"
+	clusterhandler "github.com/KusionStack/karbour/pkg/core/handler/cluster"
+	confighandler "github.com/KusionStack/karbour/pkg/core/handler/config"
+	resourcehandler "github.com/KusionStack/karbour/pkg/core/handler/resource"
+	clustermanager "github.com/KusionStack/karbour/pkg/core/manager/cluster"
+	"github.com/KusionStack/karbour/pkg/core/manager/config"
+	resourcemanager "github.com/KusionStack/karbour/pkg/core/manager/resource"
 	appmiddleware "github.com/KusionStack/karbour/pkg/middleware"
+	"github.com/KusionStack/karbour/pkg/registry"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
+	genericapiserver "k8s.io/apiserver/pkg/server"
 )
 
-func NewCoreServer(c *CompletedConfig) *chi.Mux {
+func NewCoreServer(
+	genericConfig *genericapiserver.CompletedConfig,
+	extraConfig *registry.ExtraConfig,
+) *chi.Mux {
 	router := chi.NewRouter()
 
 	// Set up middlewares
@@ -51,7 +56,7 @@ func NewCoreServer(c *CompletedConfig) *chi.Mux {
 	})
 
 	router.Route("/api/v1", func(r chi.Router) {
-		setupAPIV1(r, configMgr, clusterMgr, resourceMgr, c)
+		setupAPIV1(r, configMgr, clusterMgr, resourceMgr, genericConfig, extraConfig)
 	})
 
 	router.Get("/endpoints", func(w http.ResponseWriter, req *http.Request) {
@@ -63,7 +68,14 @@ func NewCoreServer(c *CompletedConfig) *chi.Mux {
 	return router
 }
 
-func setupAPIV1(r chi.Router, configMgr *config.Manager, clusterMgr *clustermanager.ClusterManager, resourceMgr *resourcemanager.ResourceManager, c *CompletedConfig) {
+func setupAPIV1(
+	r chi.Router,
+	configMgr *config.Manager,
+	clusterMgr *clustermanager.ClusterManager,
+	resourceMgr *resourcemanager.ResourceManager,
+	genericConfig *genericapiserver.CompletedConfig,
+	extraConfig *registry.ExtraConfig,
+) {
 	r.Route("/config", func(r chi.Router) {
 		r.Get("/", confighandler.Get(configMgr))
 		// r.Delete("/", confighandler.Delete(configMgr))
@@ -73,23 +85,23 @@ func setupAPIV1(r chi.Router, configMgr *config.Manager, clusterMgr *clustermana
 
 	r.Route("/cluster", func(r chi.Router) {
 		r.Route("/{clusterName}", func(r chi.Router) {
-			r.Get("/", clusterhandler.Get(clusterMgr, &c.GenericConfig))
-			r.Get("/yaml", clusterhandler.GetYAML(clusterMgr, &c.GenericConfig))
-			r.Get("/detail", clusterhandler.GetDetail(clusterMgr, &c.GenericConfig))
-			r.Get("/topology", clusterhandler.GetTopology(clusterMgr, &c.GenericConfig))
-			r.Get("/namespace/{namespaceName}", clusterhandler.GetNamespace(clusterMgr, &c.GenericConfig))
-			r.Get("/namespace/{namespaceName}/topology", clusterhandler.GetNamespaceTopology(clusterMgr, &c.GenericConfig))
+			r.Get("/", clusterhandler.Get(clusterMgr, genericConfig))
+			r.Get("/yaml", clusterhandler.GetYAML(clusterMgr, genericConfig))
+			r.Get("/detail", clusterhandler.GetDetail(clusterMgr, genericConfig))
+			r.Get("/topology", clusterhandler.GetTopology(clusterMgr, genericConfig))
+			r.Get("/namespace/{namespaceName}", clusterhandler.GetNamespace(clusterMgr, genericConfig))
+			r.Get("/namespace/{namespaceName}/topology", clusterhandler.GetNamespaceTopology(clusterMgr, genericConfig))
 		})
 	})
 
 	r.Route("/resource", func(r chi.Router) {
 		r.Route("/search", func(r chi.Router) {
-			r.Get("/", resourcehandler.SearchForResource(resourceMgr, c.ExtraConfig))
+			r.Get("/", resourcehandler.SearchForResource(resourceMgr, extraConfig))
 		})
 		r.Route("/cluster/{clusterName}/{apiVersion}/namespace/{namespaceName}/{kind}/name/{resourceName}", func(r chi.Router) {
-			r.Get("/", resourcehandler.Get(resourceMgr, &c.GenericConfig))
-			r.Get("/yaml", resourcehandler.GetYAML(resourceMgr, &c.GenericConfig))
-			r.Get("/topology", resourcehandler.GetTopology(resourceMgr, &c.GenericConfig))
+			r.Get("/", resourcehandler.Get(resourceMgr, genericConfig))
+			r.Get("/yaml", resourcehandler.GetYAML(resourceMgr, genericConfig))
+			r.Get("/topology", resourcehandler.GetTopology(resourceMgr, genericConfig))
 		})
 	})
 }