1
0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 21:31:18 +01:00

Update rescheduler's scheme implementation.

This commit is contained in:
Avesh Agarwal
2017-08-06 23:43:00 -04:00
parent 2900e13d37
commit 5bdcde484a
3 changed files with 9 additions and 7 deletions

View File

@@ -18,15 +18,13 @@ limitations under the License.
package options
import (
//"fmt"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
// install the componentconfig api so we get its defaulting and conversion functions
"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig"
_ "github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig/install"
"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig/v1alpha1"
reschedulerscheme "github.com/aveshagarwal/rescheduler/pkg/rescheduler/scheme"
"github.com/spf13/pflag"
)
@@ -40,9 +38,9 @@ type ReschedulerServer struct {
// NewReschedulerServer creates a new ReschedulerServer with default parameters
func NewReschedulerServer() *ReschedulerServer {
versioned := v1alpha1.ReschedulerConfiguration{}
api.Scheme.Default(&versioned)
reschedulerscheme.Scheme.Default(&versioned)
cfg := componentconfig.ReschedulerConfiguration{}
api.Scheme.Convert(versioned, &cfg, nil)
reschedulerscheme.Scheme.Convert(versioned, &cfg, nil)
s := ReschedulerServer{
ReschedulerConfiguration: cfg,
}

View File

@@ -21,14 +21,14 @@ import (
"k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig"
"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig/v1alpha1"
reschedulerscheme "github.com/aveshagarwal/rescheduler/pkg/rescheduler/scheme"
)
func init() {
Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
Install(reschedulerscheme.GroupFactoryRegistry, reschedulerscheme.Registry, reschedulerscheme.Scheme)
}
// Install registers the API group and adds types to a scheme

View File

@@ -28,10 +28,14 @@ import (
"github.com/aveshagarwal/rescheduler/pkg/rescheduler/client"
eutils "github.com/aveshagarwal/rescheduler/pkg/rescheduler/evictions/utils"
nodeutil "github.com/aveshagarwal/rescheduler/pkg/rescheduler/node"
reschedulerscheme "github.com/aveshagarwal/rescheduler/pkg/rescheduler/scheme"
"github.com/aveshagarwal/rescheduler/pkg/rescheduler/strategies"
)
func Run(rs *options.ReschedulerServer) error {
fmt.Printf("all known types=%#v\n", reschedulerscheme.Scheme.AllKnownTypes())
rsclient, err := client.CreateClient(rs.KubeconfigFile)
if err != nil {
return err