Skip to content

Commit 3c7727a

Browse files
committed
Fixes after vendor update
1 parent 655b408 commit 3c7727a

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

cluster-autoscaler/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ import (
5555
"k8s.io/client-go/tools/leaderelection/resourcelock"
5656
kube_flag "k8s.io/component-base/cli/flag"
5757
componentbaseconfig "k8s.io/component-base/config"
58+
"k8s.io/component-base/config/options"
5859
"k8s.io/component-base/metrics/legacyregistry"
5960
klog "k8s.io/klog/v2"
60-
"k8s.io/kubernetes/pkg/client/leaderelectionconfig"
6161
)
6262

6363
// MultiStringFlag is a flag for passing multiple parameters using same flag
@@ -367,7 +367,7 @@ func main() {
367367
leaderElection := defaultLeaderElectionConfiguration()
368368
leaderElection.LeaderElect = true
369369

370-
leaderelectionconfig.BindFlags(&leaderElection, pflag.CommandLine)
370+
options.BindLeaderElectionFlags(&leaderElection, pflag.CommandLine)
371371
kube_flag.InitFlags()
372372
healthCheck := metrics.NewHealthCheck(*maxInactivityTimeFlag, *maxFailingTimeFlag)
373373

cluster-autoscaler/simulator/scheduler_based_predicates_checker.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ package simulator
1919
import (
2020
"context"
2121
"fmt"
22-
"time"
2322

2423
apiv1 "k8s.io/api/core/v1"
2524
"k8s.io/client-go/informers"
2625
kube_client "k8s.io/client-go/kubernetes"
2726
v1listers "k8s.io/client-go/listers/core/v1"
2827
klog "k8s.io/klog/v2"
29-
volume_scheduling "k8s.io/kubernetes/pkg/controller/volume/scheduling"
3028
scheduler_apis_config "k8s.io/kubernetes/pkg/scheduler/apis/config"
3129
scheduler_plugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins"
3230
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
@@ -51,23 +49,12 @@ func NewSchedulerBasedPredicateChecker(kubeClient kube_client.Interface, stop <-
5149
plugins := providerRegistry[scheduler_apis_config.SchedulerDefaultProviderName]
5250
sharedLister := NewDelegatingSchedulerSharedLister()
5351

54-
volumeBinder := volume_scheduling.NewVolumeBinder(
55-
kubeClient,
56-
informerFactory.Core().V1().Nodes(),
57-
informerFactory.Storage().V1().CSINodes(),
58-
informerFactory.Core().V1().PersistentVolumeClaims(),
59-
informerFactory.Core().V1().PersistentVolumes(),
60-
informerFactory.Storage().V1().StorageClasses(),
61-
time.Duration(10)*time.Second,
62-
)
63-
6452
framework, err := schedulerframework.NewFramework(
6553
scheduler_plugins.NewInTreeRegistry(),
6654
plugins,
6755
nil, // This is fine.
6856
schedulerframework.WithInformerFactory(informerFactory),
6957
schedulerframework.WithSnapshotSharedLister(sharedLister),
70-
schedulerframework.WithVolumeBinder(volumeBinder),
7158
)
7259

7360
if err != nil {

0 commit comments

Comments
 (0)