Sets the flux cli `suspend` command `--reason` flag to an empty string

as default and changes the flux resource suspend behavior to only apply
the suspend reason annotation when a non-empty reason is provided.

Signed-off-by: Travis Mattera <travis@mattera.io>

cmd/flux/suspend.go

@@ -43,7 +43,7 @@ var suspendArgs SuspendFlags
 func init() {
 	suspendCmd.PersistentFlags().BoolVarP(&suspendArgs.all, "all", "", false,
 		"suspend all resources in that namespace")
-	suspendCmd.PersistentFlags().StringVarP(&suspendArgs.reason, "reason", "r", "suspended",
+	suspendCmd.PersistentFlags().StringVarP(&suspendArgs.reason, "reason", "r", "",
 		"set a reason for why the resource is suspended, the reason will show up under the suspend.toolkit.fluxcd.io/reason annotation")
 	rootCmd.AddCommand(suspendCmd)
 }

cmd/flux/suspend_alert.go

@@ -49,8 +49,10 @@ func (obj alertAdapter) isSuspended() bool {
 
 func (obj alertAdapter) setSuspended(reason string) {
 	obj.Alert.Spec.Suspend = true
+	if reason != "" {
 		obj.Alert.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a alertListAdapter) item(i int) suspendable {
 	return &alertAdapter{&a.AlertList.Items[i]}

cmd/flux/suspend_helmrelease.go

@@ -50,8 +50,10 @@ func (obj helmReleaseAdapter) isSuspended() bool {
 
 func (obj helmReleaseAdapter) setSuspended(reason string) {
 	obj.HelmRelease.Spec.Suspend = true
+	if reason != "" {
 		obj.HelmRelease.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a helmReleaseListAdapter) item(i int) suspendable {
 	return &helmReleaseAdapter{&a.HelmReleaseList.Items[i]}

cmd/flux/suspend_image_repository.go

@@ -49,8 +49,10 @@ func (obj imageRepositoryAdapter) isSuspended() bool {
 
 func (obj imageRepositoryAdapter) setSuspended(reason string) {
 	obj.ImageRepository.Spec.Suspend = true
+	if reason != "" {
 		obj.ImageRepository.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a imageRepositoryListAdapter) item(i int) suspendable {
 	return &imageRepositoryAdapter{&a.ImageRepositoryList.Items[i]}

cmd/flux/suspend_image_updateauto.go

@@ -49,8 +49,10 @@ func (update imageUpdateAutomationAdapter) isSuspended() bool {
 
 func (update imageUpdateAutomationAdapter) setSuspended(reason string) {
 	update.ImageUpdateAutomation.Spec.Suspend = true
+	if reason != "" {
 		update.ImageUpdateAutomation.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a imageUpdateAutomationListAdapter) item(i int) suspendable {
 	return &imageUpdateAutomationAdapter{&a.ImageUpdateAutomationList.Items[i]}

cmd/flux/suspend_kustomization.go

@@ -50,8 +50,10 @@ func (obj kustomizationAdapter) isSuspended() bool {
 
 func (obj kustomizationAdapter) setSuspended(reason string) {
 	obj.Kustomization.Spec.Suspend = true
+	if reason != "" {
 		obj.Kustomization.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a kustomizationListAdapter) item(i int) suspendable {
 	return &kustomizationAdapter{&a.KustomizationList.Items[i]}

cmd/flux/suspend_receiver.go

@@ -49,8 +49,10 @@ func (obj receiverAdapter) isSuspended() bool {
 
 func (obj receiverAdapter) setSuspended(reason string) {
 	obj.Receiver.Spec.Suspend = true
+	if reason != "" {
 		obj.Receiver.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a receiverListAdapter) item(i int) suspendable {
 	return &receiverAdapter{&a.ReceiverList.Items[i]}

cmd/flux/suspend_source_bucket.go

@@ -49,8 +49,10 @@ func (obj bucketAdapter) isSuspended() bool {
 
 func (obj bucketAdapter) setSuspended(reason string) {
 	obj.Bucket.Spec.Suspend = true
+	if reason != "" {
 		obj.Bucket.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a bucketListAdapter) item(i int) suspendable {
 	return &bucketAdapter{&a.BucketList.Items[i]}

cmd/flux/suspend_source_chart.go

@@ -49,8 +49,10 @@ func (obj helmChartAdapter) isSuspended() bool {
 
 func (obj helmChartAdapter) setSuspended(reason string) {
 	obj.HelmChart.Spec.Suspend = true
+	if reason != "" {
 		obj.HelmChart.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a helmChartListAdapter) item(i int) suspendable {
 	return &helmChartAdapter{&a.HelmChartList.Items[i]}

cmd/flux/suspend_source_git.go

@@ -49,8 +49,10 @@ func (obj gitRepositoryAdapter) isSuspended() bool {
 
 func (obj gitRepositoryAdapter) setSuspended(reason string) {
 	obj.GitRepository.Spec.Suspend = true
+	if reason != "" {
 		obj.GitRepository.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a gitRepositoryListAdapter) item(i int) suspendable {
 	return &gitRepositoryAdapter{&a.GitRepositoryList.Items[i]}

cmd/flux/suspend_source_helm.go

@@ -49,8 +49,10 @@ func (obj helmRepositoryAdapter) isSuspended() bool {
 
 func (obj helmRepositoryAdapter) setSuspended(reason string) {
 	obj.HelmRepository.Spec.Suspend = true
+	if reason != "" {
 		obj.HelmRepository.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a helmRepositoryListAdapter) item(i int) suspendable {
 	return &helmRepositoryAdapter{&a.HelmRepositoryList.Items[i]}

cmd/flux/suspend_source_oci.go

@@ -49,8 +49,10 @@ func (obj ociRepositoryAdapter) isSuspended() bool {
 
 func (obj ociRepositoryAdapter) setSuspended(reason string) {
 	obj.OCIRepository.Spec.Suspend = true
+	if reason != "" {
 		obj.OCIRepository.Annotations[SuspendReasonAnnotation] = reason
 	}
+}
 
 func (a ociRepositoryListAdapter) item(i int) suspendable {
 	return &ociRepositoryAdapter{&a.OCIRepositoryList.Items[i]}