home/cert-manager
2
0
Fork 0
mirror of https://github.com/wahyd4/cert-manager.git synced 2026-08-16 08:36:44 +10:00
Code Issues Packages Projects Releases Wiki Activity

Return error thrown when looking for events

Browse Source 
Signed-off-by: Haoxiang Zhou <haoxiang.zhou@jetstack.io>
This commit is contained in:
Haoxiang Zhou
2020-08-26 16:29:33 +02:00
parent 5f423a442e
commit 4ccf8ebdb7
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/ctl/pkg/status/certificate/certificate.go
+21 -9
View File
@@ -174,8 +174,11 @@ func (o *Options) GetResources(crtName string) (*Data, error) {
if err != nil {
return nil, err
}
// Ignore error, since if there was an error, crtEvents would be nil and handled down the line in DescribeEvents
crtEvents, _ := clientSet.CoreV1().Events(o.Namespace).Search(ctl.Scheme, crtRef)
// If no events found, crtEvents would be nil and handled down the line in DescribeEvents
crtEvents, err := clientSet.CoreV1().Events(crt.Namespace).Search(ctl.Scheme, crtRef)
if err != nil {
return nil, err
}
issuer, issuerKind, issuerError := getGenericIssuer(o.CMClient, ctx, crt)
var issuerEvents *corev1.EventList
@@ -184,11 +187,14 @@ func (o *Options) GetResources(crtName string) (*Data, error) {
if err != nil {
return nil, err
}
// Ignore error, since if there was an error, issuerEvents would be nil and handled down the line in DescribeEvents
issuerEvents, _ = clientSet.CoreV1().Events(o.Namespace).Search(ctl.Scheme, issuerRef)
// If no events found, issuerEvents would be nil and handled down the line in DescribeEvents
issuerEvents, err = clientSet.CoreV1().Events(issuer.GetNamespace()).Search(ctl.Scheme, issuerRef)
if err != nil {
return nil, err
}
}
secret, secretErr := clientSet.CoreV1().Secrets(o.Namespace).Get(ctx, crt.Spec.SecretName, metav1.GetOptions{})
secret, secretErr := clientSet.CoreV1().Secrets(crt.Namespace).Get(ctx, crt.Spec.SecretName, metav1.GetOptions{})
if secretErr != nil {
secretErr = fmt.Errorf("error when finding Secret %q: %w\n", crt.Spec.SecretName, secretErr)
}
@@ -198,8 +204,11 @@ func (o *Options) GetResources(crtName string) (*Data, error) {
if err != nil {
return nil, err
}
// Ignore error, since if there was an error, secretEvents would be nil and handled down the line in DescribeEvents
secretEvents, _ = clientSet.CoreV1().Events(o.Namespace).Search(ctl.Scheme, secretRef)
// If no events found, secretEvents would be nil and handled down the line in DescribeEvents
secretEvents, err = clientSet.CoreV1().Events(secret.Namespace).Search(ctl.Scheme, secretRef)
if err != nil {
return nil, err
}
}
// TODO: What about timing issues? When I query condition it's not ready yet, but then looking for cr it's finished and deleted
@@ -217,8 +226,11 @@ func (o *Options) GetResources(crtName string) (*Data, error) {
if err != nil {
return nil, err
}
// Ignore error, since if there was an error, reqEvents would be nil and handled down the line in DescribeEvents
reqEvents, _ = clientSet.CoreV1().Events(o.Namespace).Search(ctl.Scheme, reqRef)
// If no events found, reqEvents would be nil and handled down the line in DescribeEvents
reqEvents, err = clientSet.CoreV1().Events(req.Namespace).Search(ctl.Scheme, reqRef)
if err != nil {
return nil, err
}
}
var (