Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Release API watch resources when done. #40571

Merged
merged 1 commit into from
Feb 2, 2017
Merged

Release API watch resources when done. #40571

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions pkg/kubelet/util/csr/csr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,20 @@ func RequestNodeCertificate(client certificatesclient.CertificateSigningRequestI
})
if err != nil {
return nil, fmt.Errorf("cannot create certificate signing request: %v", err)

}

// Make a default timeout = 3600s.
var defaultTimeoutSeconds int64 = 3600
resultCh, err := client.Watch(metav1.ListOptions{
certWatch, err := client.Watch(metav1.ListOptions{
Watch: true,
TimeoutSeconds: &defaultTimeoutSeconds,
FieldSelector: fields.OneTermEqualSelector("metadata.name", req.Name).String(),
})
if err != nil {
return nil, fmt.Errorf("cannot watch on the certificate signing request: %v", err)
}

var status certificates.CertificateSigningRequestStatus
ch := resultCh.ResultChan()
defer certWatch.Stop()
ch := certWatch.ResultChan()

for {
event, ok := <-ch
Expand All @@ -91,7 +89,7 @@ func RequestNodeCertificate(client certificatesclient.CertificateSigningRequestI
if event.Object.(*certificates.CertificateSigningRequest).UID != req.UID {
continue
}
status = event.Object.(*certificates.CertificateSigningRequest).Status
status := event.Object.(*certificates.CertificateSigningRequest).Status
for _, c := range status.Conditions {
if c.Type == certificates.CertificateDenied {
return nil, fmt.Errorf("certificate signing request is not approved, reason: %v, message: %v", c.Reason, c.Message)
Expand Down