Code style changes to silence go lint.

pkg/controller/ingress.go

@@ -1119,14 +1119,14 @@ func (worker *NamespaceWorker) addOrUpdateIng(
 			return status
 		}
 		for _, tlsSecr := range offldrSpec.Secrets {
-			if status := worker.hController.AddOrUpdateTLSSecret(
-				svcKey, tlsSecr); status.IsError() {
+			status := worker.hController.AddOrUpdateTLSSecret(
+				svcKey, tlsSecr)
+			if status.IsError() {
 				return status
-			} else {
-				worker.log.Infof("Ingress TLS Secret %s/%s: "+
-					"Service %s: %s", tlsSecr.Namespace,
-					tlsSecr.Name, tlsSecr, status)
 			}
+			worker.log.Infof("Ingress TLS Secret %s/%s: "+
+				"Service %s: %s", tlsSecr.Namespace,
+				tlsSecr.Name, tlsSecr, status)
 		}
 	}
 

pkg/controller/secret.go

@@ -124,15 +124,14 @@ func (worker *NamespaceWorker) deleteTLSSecret(
 			return update.MakeRecoverable("%v", err)
 		}
 		key := svc.Namespace + "/" + svc.Name
-		if status := worker.hController.DeleteTLSSecret(
-			key, spec); status.IsError() {
+		status := worker.hController.DeleteTLSSecret(key, spec)
+		if status.IsError() {
 			return status
-		} else {
-			worker.log.Infof("Deleting TLS Secret %s/%s for "+
-				"Ingress %s/%s, Service %s/%s: %s",
-				secret.Namespace, secret.Name, ing.Namespace,
-				ing.Name, svc.Namespace, svc.Name, status)
 		}
+		worker.log.Infof("Deleting TLS Secret %s/%s for Ingress %s/%s,"+
+			" Service %s/%s: %s", secret.Namespace, secret.Name,
+			ing.Namespace, ing.Name, svc.Namespace, svc.Name,
+			status)
 	}
 	return update.MakeSuccess(
 		"TLS Secret %s/%s deleted for viking Services",