-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Use shared informers #8796
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
adrianmoisey
wants to merge
1
commit into
kubernetes:master
Choose a base branch
from
adrianmoisey:use-shared-informers
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Use shared informers #8796
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ import ( | |
| "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch" | ||
| "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource/pod/recommendation" | ||
| vpa_clientset "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/clientset/versioned" | ||
| vpa_informers "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/informers/externalversions" | ||
| "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features" | ||
| "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/target" | ||
| controllerfetcher "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/target/controller_fetcher" | ||
|
|
@@ -178,21 +179,35 @@ func run(healthCheck *metrics.HealthCheck, commonFlag *common.CommonFlags) { | |
| config := common.CreateKubeConfigOrDie(commonFlag.KubeConfig, float32(commonFlag.KubeApiQps), int(commonFlag.KubeApiBurst)) | ||
| kubeClient := kube_client.NewForConfigOrDie(config) | ||
| vpaClient := vpa_clientset.NewForConfigOrDie(config) | ||
| factory := informers.NewSharedInformerFactory(kubeClient, defaultResyncPeriod) | ||
| targetSelectorFetcher := target.NewVpaTargetSelectorFetcher(config, kubeClient, factory) | ||
| controllerFetcher := controllerfetcher.NewControllerFetcher(config, kubeClient, factory, scaleCacheEntryFreshnessTime, scaleCacheEntryLifetime, scaleCacheEntryJitterFactor) | ||
|
|
||
| kubeFactory := informers.NewSharedInformerFactory(kubeClient, defaultResyncPeriod) | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm wondering if this factory should be passed the |
||
| vpaFactory := vpa_informers.NewSharedInformerFactoryWithOptions(vpaClient, 1*time.Hour, vpa_informers.WithNamespace(commonFlag.VpaObjectNamespace)) | ||
| vpaLister := vpa_api_util.NewVpasListerFromFactory(vpaFactory) | ||
|
|
||
| targetSelectorFetcher := target.NewVpaTargetSelectorFetcher(config, kubeClient, kubeFactory) | ||
| controllerFetcher := controllerfetcher.NewControllerFetcher(config, kubeClient, kubeFactory, scaleCacheEntryFreshnessTime, scaleCacheEntryLifetime, scaleCacheEntryJitterFactor) | ||
| var limitRangeCalculator limitrange.LimitRangeCalculator | ||
| limitRangeCalculator, err := limitrange.NewLimitsRangeCalculator(factory) | ||
| limitRangeCalculator, err := limitrange.NewLimitsRangeCalculator(kubeFactory) | ||
| if err != nil { | ||
| klog.ErrorS(err, "Failed to create limitRangeCalculator, falling back to not checking limits") | ||
| limitRangeCalculator = limitrange.NewNoopLimitsCalculator() | ||
| } | ||
|
|
||
| factory.Start(stopCh) | ||
| informerMap := factory.WaitForCacheSync(stopCh) | ||
| for kind, synced := range informerMap { | ||
| kubeFactory.Start(stopCh) | ||
| vpaFactory.Start(stopCh) | ||
|
|
||
| kubeInformerMap := kubeFactory.WaitForCacheSync(stopCh) | ||
| for kind, synced := range kubeInformerMap { | ||
| if !synced { | ||
| klog.ErrorS(nil, fmt.Sprintf("Could not sync Kubernetes cache for the %s informer", kind.String())) | ||
| klog.FlushAndExit(klog.ExitFlushTimeout, 1) | ||
| } | ||
| } | ||
|
|
||
| vpaInformerMap := vpaFactory.WaitForCacheSync(stopCh) | ||
| for kind, synced := range vpaInformerMap { | ||
| if !synced { | ||
| klog.ErrorS(nil, fmt.Sprintf("Could not sync cache for the %s informer", kind.String())) | ||
| klog.ErrorS(nil, fmt.Sprintf("Could not sync VPA cache for the %s informer", kind.String())) | ||
| klog.FlushAndExit(klog.ExitFlushTimeout, 1) | ||
| } | ||
| } | ||
|
|
@@ -208,10 +223,11 @@ func run(healthCheck *metrics.HealthCheck, commonFlag *common.CommonFlags) { | |
|
|
||
| calculators := []patch.Calculator{inplace.NewResourceInPlaceUpdatesCalculator(recommendationProvider), inplace.NewInPlaceUpdatedCalculator()} | ||
|
|
||
| // TODO: use SharedInformerFactory in updater | ||
| updater, err := updater.NewUpdater( | ||
| kubeClient, | ||
| vpaClient, | ||
| kubeFactory, | ||
| vpaLister, | ||
| *minReplicas, | ||
| *evictionRateLimit, | ||
| *evictionRateBurst, | ||
|
|
||
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm wondering if this factory should be passed the
WithNamespace(commonFlags.VpaObjectNamespace)optionThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thinking about this more, I think it does make sense to pass the namespace in to the informer, however, I'm nervous for a change like this without e2e tests.
So I think I'll first make e2e tests to test the namespace command line args before I proceed with this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good