Skip to content

K
k3s
Commit beebca1b authored by nikhiljindal's avatar nikhiljindal
Browse files
Options

Stop depending on pkg/master in federated-apiserver

parent f9f1e21e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
federation/cmd/federated-apiserver/app/server.go
View file @ beebca1b
...@@ -42,7 +42,6 @@ import ( ...@@ -42,7 +42,6 @@ import (
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/genericapiserver"
"k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/cachesize"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
utilnet "k8s.io/kubernetes/pkg/util/net" utilnet "k8s.io/kubernetes/pkg/util/net"
...@@ -318,6 +317,6 @@ func getRuntimeConfigValue(s *options.APIServer, apiKey string, defaultValue boo ...@@ -318,6 +317,6 @@ func getRuntimeConfigValue(s *options.APIServer, apiKey string, defaultValue boo
// Parses the given runtime-config and formats it into genericapiserver.APIResourceConfigSource // Parses the given runtime-config and formats it into genericapiserver.APIResourceConfigSource
func parseRuntimeConfig(s *options.APIServer) (genericapiserver.APIResourceConfigSource, error) { func parseRuntimeConfig(s *options.APIServer) (genericapiserver.APIResourceConfigSource, error) {
// TODO: parse the relevant group version when we add any. // TODO: parse the relevant group version when we add any.
resourceConfig := master.DefaultAPIResourceConfigSource() resourceConfig := genericapiserver.NewResourceConfig()
return resourceConfig, nil return resourceConfig, nil
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment