Merge pull request #75 from fluxcd/test-push-status

Record last pushed commit in status

Author: squaremo

api/v1alpha1/imageupdateautomation_types.go

@@ -94,6 +94,13 @@ type ImageUpdateAutomationStatus struct {
 	// made).
 	// +optional
 	LastAutomationRunTime *metav1.Time `json:"lastAutomationRunTime,omitempty"`
+	// LastPushCommit records the SHA1 of the last commit made by the
+	// controller, for this automation object
+	// +optional
+	LastPushCommit string `json:"lastPushCommit,omitempty"`
+	// LastPushTime records the time of the last pushed change.
+	// +optional
+	LastPushTime *metav1.Time `json:"lastPushTime,omitempty"`
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 	// +optional

api/v1alpha1/zz_generated.deepcopy.go

@@ -187,6 +187,14 @@ spec:
                 description: LastHandledReconcileAt holds the value of the most recent
                   reconcile request value, so a change can be detected.
                 type: string
+              lastPushCommit:
+                description: LastPushCommit records the SHA1 of the last commit made
+                  by the controller, for this automation object
+                type: string
+              lastPushTime:
+                description: LastPushTime records the time of the last pushed change.
+                format: date-time
+                type: string
               observedGeneration:
                 format: int64
                 type: integer

config/crd/bases/image.toolkit.fluxcd.io_imageupdateautomations.yaml

@@ -199,12 +199,17 @@ func (r *ImageUpdateAutomationReconciler) Reconcile(req ctrl.Request) (ctrl.Resu
 			r.event(auto, events.EventSeverityInfo, "no updates made")
 			log.V(debug).Info("no changes made in working directory; no commit")
 			statusMessage = "no updates made"
+			if lastCommit, lastTime := auto.Status.LastPushCommit, auto.Status.LastPushTime; lastCommit != "" {
+				statusMessage = fmt.Sprintf("%s; last commit %s at %s", statusMessage, lastCommit[:7], lastTime.Format(time.RFC3339))
+			}
 		} else {
 			return failWithError(err)
 		}
 	} else {
 		r.event(auto, events.EventSeverityInfo, "committed and pushed change "+rev)
 		log.Info("pushed commit to origin", "revision", rev)
+		auto.Status.LastPushCommit = rev
+		auto.Status.LastPushTime = &metav1.Time{Time: now}
 		statusMessage = "committed and pushed " + rev
 	}
 

controllers/imageupdateautomation_controller.go

@@ -36,7 +36,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/otiai10/copy"
 	corev1 "k8s.io/api/core/v1"
-	//	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -241,6 +241,11 @@ var _ = Describe("ImageUpdateAutomation", func() {
 				Expect(err).ToNot(HaveOccurred())
 				Expect(commit.Message).To(Equal(commitMessage))
 
+				var newObj imagev1.ImageUpdateAutomation
+				Expect(k8sClient.Get(context.Background(), updateKey, &newObj)).To(Succeed())
+				Expect(newObj.Status.LastPushCommit).To(Equal(head.Hash().String()))
+				Expect(newObj.Status.LastPushTime).ToNot(BeNil())
+
 				compareRepoWithExpected(repoURL, branch, "testdata/appconfig-setters-expected", func(tmp string) {
 					replaceMarker(tmp, policyKey)
 				})
@@ -319,6 +324,7 @@ var _ = Describe("ImageUpdateAutomation", func() {
 				}, timeout, time.Second).Should(BeTrue())
 				// check that the annotation was recorded as seen
 				Expect(newUpdate.Status.LastHandledReconcileAt).To(Equal(ts))
+				expectCommittedAndPushed(newUpdate.Status.Conditions)
 
 				// check that a new commit was made
 				compareRepoWithExpected(repoURL, branch, "testdata/appconfig-setters-expected", func(tmp string) {
@@ -329,6 +335,12 @@ var _ = Describe("ImageUpdateAutomation", func() {
 	})
 })
 
+func expectCommittedAndPushed(conditions []metav1.Condition) {
+	rc := apimeta.FindStatusCondition(conditions, meta.ReadyCondition)
+	Expect(rc).ToNot(BeNil())
+	Expect(rc.Message).To(ContainSubstring("committed and pushed"))
+}
+
 func replaceMarker(path string, policyKey types.NamespacedName) {
 	// NB this requires knowledge of what's in the git
 	// repo, so a little brittle