Merge pull request #63 from fluxcd/tidies

Minor tidies

Author: squaremo

Makefile

@@ -1,5 +1,5 @@
 # Image URL to use all building/pushing image targets
-IMG ?= fluxcd/image-automation-controller
+IMG ?= fluxcd/image-automation-controller:latest
 # Produce CRDs that work back to Kubernetes 1.16
 CRD_OPTIONS ?= crd:crdVersions=v1
 

controllers/update_test.go

@@ -247,7 +247,7 @@ var _ = Describe("ImageUpdateAutomation", func() {
 			})
 
 			It("stops updating when suspended", func() {
-				// suspend it, and check that it is marked as unready.
+				// suspend it, and check that reconciliation does not run
 				var updatePatch imagev1.ImageUpdateAutomation
 				updatePatch.Name = updateKey.Name
 				updatePatch.Namespace = updateKey.Namespace
@@ -267,15 +267,16 @@ var _ = Describe("ImageUpdateAutomation", func() {
 					NamespacedName: updateKey,
 				})
 				Expect(err).To(BeNil())
-				Expect(result).To(Equal(ctrl.Result{})) // this ought to fail, since it should be rescheduled; but if not, additional checks lie below
+				// this ought to fail if suspend is not working, since the item would be requeued;
+				// but if not, additional checks lie below.
+				Expect(result).To(Equal(ctrl.Result{}))
 
 				var checkUpdate imagev1.ImageUpdateAutomation
 				Expect(k8sClient.Get(context.Background(), updateKey, &checkUpdate)).To(Succeed())
 				Expect(checkUpdate.Status.ObservedGeneration).NotTo(Equal(checkUpdate.ObjectMeta.Generation))
 			})
 
 			It("runs when the reconcile request annotation is added", func() {
-				println("[DEBUG]", updateKey.String())
 				// the automation has run, and is not expected to run
 				// again for 2 hours. Make a commit to the git repo
 				// which needs to be undone by automation, then add