-
Notifications
You must be signed in to change notification settings - Fork 340
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into refactor-node-mectirs-collector
Signed-off-by: 黄金 <[email protected]> # Conflicts: # pkg/koordlet/metricsadvisor/framework/plugin.go
- Loading branch information
Showing
106 changed files
with
7,058 additions
and
3,378 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /* | ||
| Copyright 2022 The Koordinator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package options | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "sort" | ||
| "testing" | ||
|
|
||
| "github.com/spf13/pflag" | ||
| "github.com/stretchr/testify/assert" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| ) | ||
|
|
||
| type fakeManager struct { | ||
| manager.Manager | ||
| ControllerAdded []string | ||
| } | ||
|
|
||
| type fakeController struct { | ||
| manager.Runnable | ||
| ControllerName string | ||
| } | ||
|
|
||
| func (c *fakeController) Add(mgr ctrl.Manager) error { | ||
| m, ok := mgr.(*fakeManager) | ||
| if !ok { | ||
| return fmt.Errorf("fakeController only supports fakeManager") | ||
| } | ||
| m.ControllerAdded = append(m.ControllerAdded, c.ControllerName) | ||
| return nil | ||
| } | ||
|
|
||
| func TestOptions(t *testing.T) { | ||
| t.Run("test", func(t *testing.T) { | ||
| opt := NewOptions() | ||
| assert.NotNil(t, opt) | ||
|
|
||
| args := []string{ | ||
| "", | ||
| "--controllers=noderesource,nodemetric", | ||
| } | ||
| opt.InitFlags(nil) | ||
| pflag.NewFlagSet(args[0], pflag.ExitOnError) | ||
| err := pflag.CommandLine.Parse(args[1:]) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, []string{"noderesource", "nodemetric"}, opt.Controllers) | ||
| }) | ||
| } | ||
|
|
||
| func TestOptionsApplyTo(t *testing.T) { | ||
| controllerA := &fakeController{ | ||
| ControllerName: "a", | ||
| } | ||
| controllerB := &fakeController{ | ||
| ControllerName: "b", | ||
| } | ||
| type args struct { | ||
| controllersToAdd []string | ||
| controllers map[string]func(manager.Manager) error | ||
| } | ||
| tests := []struct { | ||
| name string | ||
| args args | ||
| want []string | ||
| }{ | ||
| { | ||
| name: "add each controllers", | ||
| args: args{ | ||
| controllersToAdd: []string{"a", "b"}, | ||
| controllers: map[string]func(manager.Manager) error{ | ||
| "a": controllerA.Add, | ||
| "b": controllerB.Add, | ||
| }, | ||
| }, | ||
| want: []string{"a", "b"}, | ||
| }, | ||
| { | ||
| name: "add all controllers", | ||
| args: args{ | ||
| controllersToAdd: []string{"*"}, | ||
| controllers: map[string]func(manager.Manager) error{ | ||
| "a": controllerA.Add, | ||
| "b": controllerB.Add, | ||
| }, | ||
| }, | ||
| want: []string{"a", "b"}, | ||
| }, | ||
| { | ||
| name: "add some controllers", | ||
| args: args{ | ||
| controllersToAdd: []string{"b"}, | ||
| controllers: map[string]func(manager.Manager) error{ | ||
| "a": controllerA.Add, | ||
| "b": controllerB.Add, | ||
| }, | ||
| }, | ||
| want: []string{"b"}, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| opt := &Options{ | ||
| Controllers: tt.args.controllersToAdd, | ||
| ControllerAddFuncs: tt.args.controllers, | ||
| } | ||
|
|
||
| mgr := &fakeManager{} | ||
| err := opt.ApplyTo(mgr) | ||
| assert.NoError(t, err) | ||
| sort.Strings(mgr.ControllerAdded) | ||
| assert.Equal(t, tt.want, mgr.ControllerAdded) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| Copyright 2022 The Koordinator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package options | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| clientgoscheme "k8s.io/client-go/kubernetes/scheme" | ||
| "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1" | ||
|
|
||
| configv1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" | ||
| schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" | ||
| slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" | ||
| ) | ||
|
|
||
| var Scheme = runtime.NewScheme() | ||
|
|
||
| func init() { | ||
| _ = clientgoscheme.AddToScheme(Scheme) | ||
| _ = configv1alpha1.AddToScheme(clientgoscheme.Scheme) | ||
| _ = slov1alpha1.AddToScheme(clientgoscheme.Scheme) | ||
| _ = schedulingv1alpha1.AddToScheme(clientgoscheme.Scheme) | ||
|
|
||
| _ = configv1alpha1.AddToScheme(Scheme) | ||
| _ = slov1alpha1.AddToScheme(Scheme) | ||
| _ = schedulingv1alpha1.AddToScheme(Scheme) | ||
| _ = v1alpha1.AddToScheme(Scheme) | ||
|
|
||
| Scheme.AddUnversionedTypes(metav1.SchemeGroupVersion, &metav1.UpdateOptions{}, &metav1.DeleteOptions{}, &metav1.CreateOptions{}) | ||
| // +kubebuilder:scaffold:scheme | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.