Fix and simplify the logic to choose add or update haproxy offloader.

While here, make sure that dataplane transactions get deleted,
including after errors.

pkg/haproxy/haproxy.go

@@ -397,9 +397,10 @@ func (hc *Controller) updateInstance(inst *haproxyInst, spec *Spec) error {
 	hc.log.Debugf("Offloader instance %s: started transaction: %+v",
 		inst.name, tx)
 
-	if len(spec.Secrets) > 0 && !inst.status.offLoaded {
-		if tx.Version <= 1 || inst.spec == nil ||
-			len(inst.spec.Secrets) == 0 {
+	defer inst.dplane.DeleteTx(tx)
+
+	if len(spec.Secrets) > 0 {
+		if !inst.status.offLoaded {
 			hc.log.Debugf("Offloader instance %s: "+
 				"adding TLS config", inst.name)
 			err = inst.dplane.AddOffldr(tx)