fix: move error log and release 0.22.1

Kong · Sep 26, 2022 · 78b1222 · 78b1222
1 parent 65cad32
commit 78b1222
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.22.1
+
+### Fixed
+
+- Moved metallb error recording inside context switch, to avoid
+  recording the context expiration as the last error.
+
 ## v0.22.0
 
 ### Added 

diff --git a/pkg/clusters/addons/metallb/metallb.go b/pkg/clusters/addons/metallb/metallb.go
@@ -237,9 +237,9 @@ func createIPAddressPool(ctx context.Context, cluster clusters.Cluster, dockerNe
 				err = res.Delete(ctx, addressPoolName, metav1.DeleteOptions{})
 			}
 
-			lastErr = err
 			select {
 			case <-time.After(time.Second):
+				lastErr = err
 				continue
 			case <-ctx.Done():
 				return fmt.Errorf("failed to create metallb.io/v1beta1 IPAddressPool: %w, last error on create: %v", ctx.Err(), lastErr)