@@ -248,18 +248,16 @@ func (c *Controller) trustIfChanged(newSecret *corev1.Secret, oldSecret *corev1.
248
248
if err := c .addTLSCertificatesToTrustInTransport (newPublicCert ); err == nil {
249
249
klog .Infof ("Added certificates in field '%s' of '%s/%s' secret to trusted RootCA's" , fieldToCompare , newSecret .Namespace , newSecret .Name )
250
250
return true
251
- } else {
252
- klog .Errorf ("Failed adding certs in field '%s' of '%s/%s' secret: %v" , fieldToCompare , newSecret .Namespace , newSecret .Name , err )
253
251
}
252
+ klog .Errorf ("Failed adding certs in field '%s' of '%s/%s' secret: %v" , fieldToCompare , newSecret .Namespace , newSecret .Name , err )
254
253
}
255
254
} else {
256
255
// If filed was not present in old secret but is in new secret then is an addition, we trust it
257
256
if err := c .addTLSCertificatesToTrustInTransport (newPublicCert ); err == nil {
258
257
klog .Infof ("Added certificates in field '%s' of '%s/%s' secret to trusted RootCA's" , fieldToCompare , newSecret .Namespace , newSecret .Name )
259
258
return true
260
- } else {
261
- klog .Errorf ("Failed adding certs in field %s of '%s/%s' secret: %v" , fieldToCompare , newSecret .Namespace , newSecret .Name , err )
262
259
}
260
+ klog .Errorf ("Failed adding certs in field %s of '%s/%s' secret: %v" , fieldToCompare , newSecret .Namespace , newSecret .Name , err )
263
261
}
264
262
}
265
263
return false
@@ -271,9 +269,8 @@ func (c *Controller) trustPEMInSecretField(secret *corev1.Secret, fieldToCompare
271
269
if err := c .addTLSCertificatesToTrustInTransport (newPublicCert ); err == nil {
272
270
klog .Infof ("Added certificates in field '%s' of '%s/%s' secret to trusted RootCA's" , fieldToCompare , secret .Namespace , secret .Name )
273
271
return true
274
- } else {
275
- klog .Errorf ("Failed adding certs in field '%s' of '%s/%s' secret: %v" , fieldToCompare , secret .Namespace , secret .Name , err )
276
272
}
273
+ klog .Errorf ("Failed adding certs in field '%s' of '%s/%s' secret: %v" , fieldToCompare , secret .Namespace , secret .Name , err )
277
274
}
278
275
return false
279
276
}
0 commit comments