github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-09-02 05:34:25 +00:00
Code Issues Projects Releases Wiki Activity

K-EXPLORER: Merge branch 'master' into ke/v0.2

Browse Source
This commit is contained in:
niusmallnan
2021-08-23 16:02:32 +08:00
parent eb573e2af8 8ecda307ee
commit 68b9d2e74a
12 changed files with 90 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/server.go
View File

@@ -37,6 +37,7 @@ type Server struct {
AccessSetLookup accesscontrol.AccessSetLookup
APIServer *apiserver.Server
ClusterRegistry string
Version string
authMiddleware auth.Middleware
controllers *Controllers
@@ -59,6 +60,7 @@ type Options struct {
AggregationSecretNamespace string
AggregationSecretName string
ClusterRegistry string
ServerVersion string
}
func New(ctx context.Context, restConfig *rest.Config, opts *Options) (*Server, error) {
@@ -77,6 +79,7 @@ func New(ctx context.Context, restConfig *rest.Config, opts *Options) (*Server,
aggregationSecretNamespace: opts.AggregationSecretNamespace,
aggregationSecretName: opts.AggregationSecretName,
ClusterRegistry: opts.ClusterRegistry,
Version: opts.ServerVersion,
}
if err := setup(ctx, server); err != nil {
@@ -135,7 +138,7 @@ func setup(ctx context.Context, server *Server) error {
server.ClusterCache = ccache
sf := schema.NewCollection(ctx, server.BaseSchemas, asl)
if err = resources.DefaultSchemas(ctx, server.BaseSchemas, ccache, server.ClientFactory, sf); err != nil {
if err = resources.DefaultSchemas(ctx, server.BaseSchemas, ccache, server.ClientFactory, sf, server.Version); err != nil {
return err
}