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

Merge pull request #4231 from maelvls/fix-concurrent-read-write

Browse Source 
Data race: fix concurrent read and write of secret annotations and certificaterequests
This commit is contained in:
jetstack-bot 2021-07-26 13:34:12 +01:00 committed by GitHub
commit ceb9fdf6ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/certificaterequests/approver/sync.go
View File

@ -53,6 +53,7 @@ func (c *Controller) Sync(ctx context.Context, cr *cmapi.CertificateRequest) (er
}
// Update the CertificateRequest approved condition to true.
cr = cr.DeepCopy()
apiutil.SetCertificateRequestCondition(cr,
cmapi.CertificateRequestConditionApproved,
cmmeta.ConditionTrue,

1
pkg/controller/certificates/internal/secretsmanager/secret.go
View File

@ -102,6 +102,7 @@ func (s *SecretsManager) UpdateData(ctx context.Context, crt *cmapi.Certificate,
secret.OwnerReferences = []metav1.OwnerReference{*metav1.NewControllerRef(crt, certificateGvk)}
}
secret = secret.DeepCopy()
err = s.setValues(crt, secret, data)
if err != nil {
return err