github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-21 11:07:38 +00:00
Code Issues Projects Releases Wiki Activity

Interrupt WaitForCertificate if desired kubelet serving cert changes

Browse Source 
Kubernetes-commit: 739a75fc32c5337ddbd13691e9bf6648fb13ff0d
This commit is contained in:
Jordan Liggitt
2019-05-15 11:47:23 -04:00
committed by Kubernetes Publisher
parent 864b54ac36
commit 987d27d1af
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/certificate/csr/csr.go
View File

@@ -82,7 +82,7 @@ func RequestCertificate(client certificatesclient.CertificateSigningRequestInter
}
// WaitForCertificate waits for a certificate to be issued until timeout, or returns an error.
func WaitForCertificate(client certificatesclient.CertificateSigningRequestInterface, req *certificates.CertificateSigningRequest, timeout time.Duration) (certData []byte, err error) {
func WaitForCertificate(ctx context.Context, client certificatesclient.CertificateSigningRequestInterface, req *certificates.CertificateSigningRequest) (certData []byte, err error) {
fieldSelector := fields.OneTermEqualSelector("metadata.name", req.Name).String()
lw := &cache.ListWatch{
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
@@ -94,8 +94,6 @@ func WaitForCertificate(client certificatesclient.CertificateSigningRequestInter
return client.Watch(options)
},
}
ctx, cancel := watchtools.ContextWithOptionalTimeout(context.Background(), timeout)
defer cancel()
event, err := watchtools.UntilWithSync(
ctx,
lw,