weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6234 from SgtCoDFish/context

Browse Source 
Use supplied context where possible
This commit is contained in:
jetstack-bot 2023-07-26 13:20:07 +02:00 committed by GitHub
commit ab2a8c58d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/cainjector/indexers.go
View File

@ -54,15 +54,16 @@ func certFromSecretToInjectableMapFuncBuilder(cl client.Reader, log logr.Logger,
}
log = log.WithValues("type", config.resourceName, "secret", secretName, "certificate", *certName)
var cert cmapi.Certificate
// confirm that a service owns this cert
if err := cl.Get(context.Background(), *certName, &cert); err != nil {
var cert cmapi.Certificate
if err := cl.Get(ctx, *certName, &cert); err != nil {
// TODO(directxman12): check for not found error?
log.Error(err, "unable to fetch certificate that owns the secret")
return nil
}
objs := config.listType.DeepCopyObject().(client.ObjectList)
if err := cl.List(context.Background(), objs, client.MatchingFields{injectFromPath: certName.String()}); err != nil {
if err := cl.List(ctx, objs, client.MatchingFields{injectFromPath: certName.String()}); err != nil {
log.Error(err, "unable to fetch injectables associated with certificate")
return nil
}
@ -98,7 +99,7 @@ func certToInjectableMapFuncBuilder(cl client.Reader, log logr.Logger, config se
certName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: obj.GetName()}
log = log.WithValues("type", config.resourceName, "certificate", certName)
objs := config.listType.DeepCopyObject().(client.ObjectList)
if err := cl.List(context.Background(), objs, client.MatchingFields{injectFromPath: certName.String()}); err != nil {
if err := cl.List(ctx, objs, client.MatchingFields{injectFromPath: certName.String()}); err != nil {
log.Error(err, "unable to fetch injectables associated with certificate")
return nil
}
@ -136,7 +137,7 @@ func secretForInjectableMapFuncBuilder(cl client.Reader, log logr.Logger, config
log = log.WithValues("type", config.resourceName, "secret", secretName)
objs := config.listType.DeepCopyObject().(client.ObjectList)
// TODO: ensure that this is cache lister, not a direct client
if err := cl.List(context.Background(), objs, client.MatchingFields{injectFromSecretPath: secretName.String()}); err != nil {
if err := cl.List(ctx, objs, client.MatchingFields{injectFromSecretPath: secretName.String()}); err != nil {
log.Error(err, "unable to fetch injectables associated with secret")
return nil
}