Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes/autoscaler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dc3e4e3a48697accef5d20a6d8d758a00711faeb
Choose a base ref
..
head repository: kubernetes/autoscaler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c583dfde8675dc6b9af3a7565f3011a7ab55d0e
Choose a head ref
Showing with 22 additions and 22 deletions.
  1. +22 −22 cluster-autoscaler/main.go
44 changes: 22 additions & 22 deletions cluster-autoscaler/main.go
View file
Original file line number Diff line number Diff line change
@@ -516,28 +516,6 @@ func buildAutoscaler(debuggingSnapshotter debuggingsnapshot.DebuggingSnapshotter
opts.Processors.TemplateNodeInfoProvider = nodeinfosprovider.NewDefaultTemplateNodeInfoProvider(nodeInfoCacheExpireTime, *forceDaemonSets)
podListProcessor := podlistprocessor.NewDefaultPodListProcessor(opts.PredicateChecker, scheduling.ScheduleAnywhere)

// Add pod sharding related processors if pod sharding is enabled.
if autoscalingOptions.PodShardingEnabled {
klog.Info("Pod sharding is enabled")

PodShardingNodeSelectors := make(map[string]string)
for _, label := range autoscalingOptions.PodShardingNodeSelectors {
parts := strings.Split(label, "=")
if len(parts) != 2 {
klog.Errorf("Invalid pod sharding label: %s", label)
continue
}

PodShardingNodeSelectors[parts[0]] = parts[1]
}

podsharder := podsharding.NewOssPodSharder(PodShardingNodeSelectors)
podshardselector := podsharding.NewLruPodShardSelector()
podShardFilter := podsharding.NewPredicatePodShardFilter()
podShardingProcessor := podsharding.NewPodShardingProcessor(podsharder, podshardselector, podShardFilter)
podListProcessor.AddProcessor(podShardingProcessor)
}

if autoscalingOptions.ProvisioningRequestEnabled {
podListProcessor.AddProcessor(provreq.NewProvisioningRequestPodsFilter(provreq.NewDefautlEventManager()))

@@ -563,6 +541,28 @@ func buildAutoscaler(debuggingSnapshotter debuggingsnapshot.DebuggingSnapshotter
podListProcessor.AddProcessor(provreqProcesor)
}

// Add pod sharding related processors if pod sharding is enabled.
if autoscalingOptions.PodShardingEnabled {
klog.Info("Pod sharding is enabled")

PodShardingNodeSelectors := make(map[string]string)
for _, label := range autoscalingOptions.PodShardingNodeSelectors {
parts := strings.Split(label, "=")
if len(parts) != 2 {
klog.Errorf("Invalid pod sharding label: %s", label)
continue
}

PodShardingNodeSelectors[parts[0]] = parts[1]
}

podsharder := podsharding.NewOssPodSharder(PodShardingNodeSelectors)
podshardselector := podsharding.NewLruPodShardSelector()
podShardFilter := podsharding.NewPredicatePodShardFilter()
podShardingProcessor := podsharding.NewPodShardingProcessor(podsharder, podshardselector, podShardFilter)
podListProcessor.AddProcessor(podShardingProcessor)
}

if *proactiveScaleupEnabled {
podInjectionBackoffRegistry := podinjectionbackoff.NewFakePodControllerRegistry()