From 054a62fb302e139c6c5cc98eefc5c201fe650d85 Mon Sep 17 00:00:00 2001 From: Somtochi Onyekwere Date: Wed, 7 Apr 2021 16:40:16 +0100 Subject: [PATCH] Format go imports Signed-off-by: Somtochi Onyekwere --- cmd/flux/alert.go | 3 ++- cmd/flux/alert_provider.go | 3 ++- cmd/flux/delete_alert.go | 3 ++- cmd/flux/delete_alertprovider.go | 3 ++- cmd/flux/delete_helmrelease.go | 3 ++- cmd/flux/delete_kustomization.go | 3 ++- cmd/flux/delete_receiver.go | 3 ++- cmd/flux/delete_source_bucket.go | 3 ++- cmd/flux/delete_source_git.go | 3 ++- cmd/flux/delete_source_helm.go | 3 ++- cmd/flux/export_alert.go | 3 ++- cmd/flux/export_alertprovider.go | 3 ++- cmd/flux/export_helmrelease.go | 3 ++- cmd/flux/export_kustomization.go | 3 ++- cmd/flux/export_receiver.go | 3 ++- cmd/flux/export_secret.go | 3 ++- cmd/flux/export_source_bucket.go | 3 ++- cmd/flux/export_source_git.go | 3 ++- cmd/flux/export_source_helm.go | 3 ++- cmd/flux/get_alert.go | 3 ++- cmd/flux/get_alertprovider.go | 3 ++- cmd/flux/get_image_all.go | 3 ++- cmd/flux/get_kustomization.go | 3 ++- cmd/flux/get_receiver.go | 3 ++- cmd/flux/get_source_all.go | 3 ++- cmd/flux/get_source_bucket.go | 3 ++- cmd/flux/get_source_chart.go | 3 ++- cmd/flux/get_source_git.go | 3 ++- cmd/flux/get_source_helm.go | 3 ++- cmd/flux/helmrelease.go | 3 ++- cmd/flux/kustomization.go | 3 ++- cmd/flux/receiver.go | 3 ++- cmd/flux/reconcile.go | 5 +++-- cmd/flux/reconcile_alert.go | 3 ++- cmd/flux/reconcile_alertprovider.go | 6 +++--- cmd/flux/reconcile_helmrelease.go | 3 ++- cmd/flux/reconcile_kustomization.go | 3 ++- cmd/flux/reconcile_receiver.go | 6 +++--- cmd/flux/reconcile_source_bucket.go | 3 ++- cmd/flux/reconcile_source_git.go | 4 +++- cmd/flux/reconcile_source_helm.go | 4 +++- cmd/flux/reconcile_with_source.go | 7 +++++-- cmd/flux/resume_alert.go | 4 ++-- cmd/flux/resume_helmrelease.go | 4 +++- cmd/flux/resume_kustomization.go | 3 ++- cmd/flux/resume_receiver.go | 3 ++- cmd/flux/resume_source_bucket.go | 3 ++- cmd/flux/resume_source_chart.go | 3 ++- cmd/flux/resume_source_git.go | 3 ++- cmd/flux/resume_source_helm.go | 3 ++- cmd/flux/suspend_alert.go | 3 ++- cmd/flux/suspend_helmrelease.go | 3 ++- cmd/flux/suspend_kustomization.go | 3 ++- cmd/flux/suspend_receiver.go | 3 ++- cmd/flux/suspend_source_bucket.go | 3 ++- cmd/flux/suspend_source_chart.go | 4 ++-- cmd/flux/suspend_source_git.go | 4 ++-- cmd/flux/suspend_source_helm.go | 4 ++-- 58 files changed, 125 insertions(+), 68 deletions(-) diff --git a/cmd/flux/alert.go b/cmd/flux/alert.go index e0bc2887..1ccb94f5 100644 --- a/cmd/flux/alert.go +++ b/cmd/flux/alert.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) // notificationv1.Alert diff --git a/cmd/flux/alert_provider.go b/cmd/flux/alert_provider.go index c2722ff0..07963b05 100644 --- a/cmd/flux/alert_provider.go +++ b/cmd/flux/alert_provider.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) // notificationv1.Provider diff --git a/cmd/flux/delete_alert.go b/cmd/flux/delete_alert.go index bbce1356..3b1ac9ce 100644 --- a/cmd/flux/delete_alert.go +++ b/cmd/flux/delete_alert.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var deleteAlertCmd = &cobra.Command{ diff --git a/cmd/flux/delete_alertprovider.go b/cmd/flux/delete_alertprovider.go index bd24b7b6..c1de6fea 100644 --- a/cmd/flux/delete_alertprovider.go +++ b/cmd/flux/delete_alertprovider.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var deleteAlertProviderCmd = &cobra.Command{ diff --git a/cmd/flux/delete_helmrelease.go b/cmd/flux/delete_helmrelease.go index 6d91861a..05ad157a 100644 --- a/cmd/flux/delete_helmrelease.go +++ b/cmd/flux/delete_helmrelease.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" "github.com/spf13/cobra" + + helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" ) var deleteHelmReleaseCmd = &cobra.Command{ diff --git a/cmd/flux/delete_kustomization.go b/cmd/flux/delete_kustomization.go index 8be71f41..5e03ad95 100644 --- a/cmd/flux/delete_kustomization.go +++ b/cmd/flux/delete_kustomization.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" "github.com/spf13/cobra" + + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" ) var deleteKsCmd = &cobra.Command{ diff --git a/cmd/flux/delete_receiver.go b/cmd/flux/delete_receiver.go index 11f45192..5806b6df 100644 --- a/cmd/flux/delete_receiver.go +++ b/cmd/flux/delete_receiver.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var deleteReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/delete_source_bucket.go b/cmd/flux/delete_source_bucket.go index 2c19e729..3549efb9 100644 --- a/cmd/flux/delete_source_bucket.go +++ b/cmd/flux/delete_source_bucket.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var deleteSourceBucketCmd = &cobra.Command{ diff --git a/cmd/flux/delete_source_git.go b/cmd/flux/delete_source_git.go index c5123672..36e4303a 100644 --- a/cmd/flux/delete_source_git.go +++ b/cmd/flux/delete_source_git.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var deleteSourceGitCmd = &cobra.Command{ diff --git a/cmd/flux/delete_source_helm.go b/cmd/flux/delete_source_helm.go index b6e9eff3..35cc2ad0 100644 --- a/cmd/flux/delete_source_helm.go +++ b/cmd/flux/delete_source_helm.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var deleteSourceHelmCmd = &cobra.Command{ diff --git a/cmd/flux/export_alert.go b/cmd/flux/export_alert.go index 074a43e1..32b660e2 100644 --- a/cmd/flux/export_alert.go +++ b/cmd/flux/export_alert.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var exportAlertCmd = &cobra.Command{ diff --git a/cmd/flux/export_alertprovider.go b/cmd/flux/export_alertprovider.go index 4288107e..ddb6fe2f 100644 --- a/cmd/flux/export_alertprovider.go +++ b/cmd/flux/export_alertprovider.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var exportAlertProviderCmd = &cobra.Command{ diff --git a/cmd/flux/export_helmrelease.go b/cmd/flux/export_helmrelease.go index 2a5d90bb..961caa3c 100644 --- a/cmd/flux/export_helmrelease.go +++ b/cmd/flux/export_helmrelease.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( - helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" ) var exportHelmReleaseCmd = &cobra.Command{ diff --git a/cmd/flux/export_kustomization.go b/cmd/flux/export_kustomization.go index 7ff3fa82..d6f4e1db 100644 --- a/cmd/flux/export_kustomization.go +++ b/cmd/flux/export_kustomization.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( - kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" ) var exportKsCmd = &cobra.Command{ diff --git a/cmd/flux/export_receiver.go b/cmd/flux/export_receiver.go index 4a798ebf..54c8e75d 100644 --- a/cmd/flux/export_receiver.go +++ b/cmd/flux/export_receiver.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var exportReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/export_secret.go b/cmd/flux/export_secret.go index ab75a156..74d018b2 100644 --- a/cmd/flux/export_secret.go +++ b/cmd/flux/export_secret.go @@ -19,12 +19,13 @@ package main import ( "context" "fmt" - "github.com/fluxcd/flux2/internal/utils" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/fluxcd/flux2/internal/utils" ) // exportableWithSecret represents a type that you can fetch from the Kubernetes diff --git a/cmd/flux/export_source_bucket.go b/cmd/flux/export_source_bucket.go index 6d9652df..7a7039c1 100644 --- a/cmd/flux/export_source_bucket.go +++ b/cmd/flux/export_source_bucket.go @@ -17,10 +17,11 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var exportSourceBucketCmd = &cobra.Command{ diff --git a/cmd/flux/export_source_git.go b/cmd/flux/export_source_git.go index aeda9cd8..7f069193 100644 --- a/cmd/flux/export_source_git.go +++ b/cmd/flux/export_source_git.go @@ -17,10 +17,11 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var exportSourceGitCmd = &cobra.Command{ diff --git a/cmd/flux/export_source_helm.go b/cmd/flux/export_source_helm.go index e12d1f80..62499987 100644 --- a/cmd/flux/export_source_helm.go +++ b/cmd/flux/export_source_helm.go @@ -17,10 +17,11 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var exportSourceHelmCmd = &cobra.Command{ diff --git a/cmd/flux/get_alert.go b/cmd/flux/get_alert.go index 279dd602..4b4f5478 100644 --- a/cmd/flux/get_alert.go +++ b/cmd/flux/get_alert.go @@ -20,8 +20,9 @@ import ( "strconv" "strings" - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var getAlertCmd = &cobra.Command{ diff --git a/cmd/flux/get_alertprovider.go b/cmd/flux/get_alertprovider.go index 6a7756d0..05128b53 100644 --- a/cmd/flux/get_alertprovider.go +++ b/cmd/flux/get_alertprovider.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var getAlertProviderCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_all.go b/cmd/flux/get_image_all.go index 79162beb..5f3c0728 100644 --- a/cmd/flux/get_image_all.go +++ b/cmd/flux/get_image_all.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( + "github.com/spf13/cobra" + autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha1" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha1" - "github.com/spf13/cobra" ) var getImageAllCmd = &cobra.Command{ diff --git a/cmd/flux/get_kustomization.go b/cmd/flux/get_kustomization.go index 570b428e..0961763e 100644 --- a/cmd/flux/get_kustomization.go +++ b/cmd/flux/get_kustomization.go @@ -20,8 +20,9 @@ import ( "strconv" "strings" - kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" "github.com/spf13/cobra" + + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" ) var getKsCmd = &cobra.Command{ diff --git a/cmd/flux/get_receiver.go b/cmd/flux/get_receiver.go index 7009458f..4e72446e 100644 --- a/cmd/flux/get_receiver.go +++ b/cmd/flux/get_receiver.go @@ -20,8 +20,9 @@ import ( "strconv" "strings" - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var getReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_all.go b/cmd/flux/get_source_all.go index 8a64725e..55770de5 100644 --- a/cmd/flux/get_source_all.go +++ b/cmd/flux/get_source_all.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var getSourceAllCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_bucket.go b/cmd/flux/get_source_bucket.go index f487d2d3..58b55acc 100644 --- a/cmd/flux/get_source_bucket.go +++ b/cmd/flux/get_source_bucket.go @@ -17,11 +17,12 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "strconv" "strings" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var getSourceBucketCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_chart.go b/cmd/flux/get_source_chart.go index 4e06acbc..3439034e 100644 --- a/cmd/flux/get_source_chart.go +++ b/cmd/flux/get_source_chart.go @@ -20,8 +20,9 @@ import ( "strconv" "strings" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var getSourceHelmChartCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_git.go b/cmd/flux/get_source_git.go index f75982d0..f58994c9 100644 --- a/cmd/flux/get_source_git.go +++ b/cmd/flux/get_source_git.go @@ -20,8 +20,9 @@ import ( "strconv" "strings" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var getSourceGitCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_helm.go b/cmd/flux/get_source_helm.go index 63f22d83..1c2f64e9 100644 --- a/cmd/flux/get_source_helm.go +++ b/cmd/flux/get_source_helm.go @@ -20,8 +20,9 @@ import ( "strconv" "strings" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var getSourceHelmCmd = &cobra.Command{ diff --git a/cmd/flux/helmrelease.go b/cmd/flux/helmrelease.go index 109dc3f6..91a30d22 100644 --- a/cmd/flux/helmrelease.go +++ b/cmd/flux/helmrelease.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" "sigs.k8s.io/controller-runtime/pkg/client" + + helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" ) // helmv2.HelmRelease diff --git a/cmd/flux/kustomization.go b/cmd/flux/kustomization.go index 49cdbace..35976108 100644 --- a/cmd/flux/kustomization.go +++ b/cmd/flux/kustomization.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" + + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" ) // kustomizev1.Kustomization diff --git a/cmd/flux/receiver.go b/cmd/flux/receiver.go index 3de4cbb3..1662e558 100644 --- a/cmd/flux/receiver.go +++ b/cmd/flux/receiver.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) // notificationv1.Receiver diff --git a/cmd/flux/reconcile.go b/cmd/flux/reconcile.go index 574f8064..8b5280af 100644 --- a/cmd/flux/reconcile.go +++ b/cmd/flux/reconcile.go @@ -19,10 +19,8 @@ package main import ( "context" "fmt" - "github.com/fluxcd/notification-controller/api/v1beta1" "time" - "github.com/fluxcd/pkg/apis/meta" "github.com/spf13/cobra" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -31,6 +29,9 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/fluxcd/notification-controller/api/v1beta1" + "github.com/fluxcd/pkg/apis/meta" + "github.com/fluxcd/flux2/internal/utils" ) diff --git a/cmd/flux/reconcile_alert.go b/cmd/flux/reconcile_alert.go index f7ce7481..2bc79c9c 100644 --- a/cmd/flux/reconcile_alert.go +++ b/cmd/flux/reconcile_alert.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var reconcileAlertCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_alertprovider.go b/cmd/flux/reconcile_alertprovider.go index 14d6f379..ccf68bdb 100644 --- a/cmd/flux/reconcile_alertprovider.go +++ b/cmd/flux/reconcile_alertprovider.go @@ -21,14 +21,14 @@ import ( "fmt" "time" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/pkg/apis/meta" - "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" + "github.com/fluxcd/pkg/apis/meta" + + "github.com/fluxcd/flux2/internal/utils" ) var reconcileAlertProviderCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_helmrelease.go b/cmd/flux/reconcile_helmrelease.go index ed42451f..79ef2f8e 100644 --- a/cmd/flux/reconcile_helmrelease.go +++ b/cmd/flux/reconcile_helmrelease.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( + "github.com/spf13/cobra" + helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" - "github.com/spf13/cobra" ) var reconcileHrCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_kustomization.go b/cmd/flux/reconcile_kustomization.go index f2a1c5b1..4644fcf9 100644 --- a/cmd/flux/reconcile_kustomization.go +++ b/cmd/flux/reconcile_kustomization.go @@ -17,9 +17,10 @@ limitations under the License. package main import ( + "github.com/spf13/cobra" + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" - "github.com/spf13/cobra" ) var reconcileKsCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_receiver.go b/cmd/flux/reconcile_receiver.go index 39e45ed5..8ec849de 100644 --- a/cmd/flux/reconcile_receiver.go +++ b/cmd/flux/reconcile_receiver.go @@ -21,14 +21,14 @@ import ( "fmt" "time" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/pkg/apis/meta" - "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" + "github.com/fluxcd/pkg/apis/meta" + + "github.com/fluxcd/flux2/internal/utils" ) var reconcileReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_source_bucket.go b/cmd/flux/reconcile_source_bucket.go index 3955747c..6fa346ba 100644 --- a/cmd/flux/reconcile_source_bucket.go +++ b/cmd/flux/reconcile_source_bucket.go @@ -19,7 +19,7 @@ package main import ( "context" "fmt" - "github.com/fluxcd/pkg/apis/meta" + "github.com/spf13/cobra" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) diff --git a/cmd/flux/reconcile_source_git.go b/cmd/flux/reconcile_source_git.go index 98eb67de..9c01a8fc 100644 --- a/cmd/flux/reconcile_source_git.go +++ b/cmd/flux/reconcile_source_git.go @@ -18,8 +18,10 @@ package main import ( "fmt" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" + "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var reconcileSourceGitCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_source_helm.go b/cmd/flux/reconcile_source_helm.go index 34455cef..736b9245 100644 --- a/cmd/flux/reconcile_source_helm.go +++ b/cmd/flux/reconcile_source_helm.go @@ -18,8 +18,10 @@ package main import ( "fmt" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" + "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var reconcileSourceHelmCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_with_source.go b/cmd/flux/reconcile_with_source.go index 59ee5bfb..d99ef8f9 100644 --- a/cmd/flux/reconcile_with_source.go +++ b/cmd/flux/reconcile_with_source.go @@ -3,12 +3,15 @@ package main import ( "context" "fmt" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/pkg/apis/meta" + "github.com/spf13/cobra" apimeta "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" + + "github.com/fluxcd/pkg/apis/meta" + + "github.com/fluxcd/flux2/internal/utils" ) type reconcileWithSource interface { diff --git a/cmd/flux/resume_alert.go b/cmd/flux/resume_alert.go index a2e3df31..b221ca0e 100644 --- a/cmd/flux/resume_alert.go +++ b/cmd/flux/resume_alert.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" - "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var resumeAlertCmd = &cobra.Command{ diff --git a/cmd/flux/resume_helmrelease.go b/cmd/flux/resume_helmrelease.go index 9cb51b05..e2cff0fb 100644 --- a/cmd/flux/resume_helmrelease.go +++ b/cmd/flux/resume_helmrelease.go @@ -18,8 +18,10 @@ package main import ( "fmt" - helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" + "github.com/spf13/cobra" + + helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" ) var resumeHrCmd = &cobra.Command{ diff --git a/cmd/flux/resume_kustomization.go b/cmd/flux/resume_kustomization.go index d3edc964..ac2def27 100644 --- a/cmd/flux/resume_kustomization.go +++ b/cmd/flux/resume_kustomization.go @@ -19,8 +19,9 @@ package main import ( "fmt" - kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" "github.com/spf13/cobra" + + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" ) var resumeKsCmd = &cobra.Command{ diff --git a/cmd/flux/resume_receiver.go b/cmd/flux/resume_receiver.go index 1ce408a0..7bf37577 100644 --- a/cmd/flux/resume_receiver.go +++ b/cmd/flux/resume_receiver.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var resumeReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/resume_source_bucket.go b/cmd/flux/resume_source_bucket.go index a73b7a90..a7a81124 100644 --- a/cmd/flux/resume_source_bucket.go +++ b/cmd/flux/resume_source_bucket.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var resumeSourceBucketCmd = &cobra.Command{ diff --git a/cmd/flux/resume_source_chart.go b/cmd/flux/resume_source_chart.go index c4d47f38..f2cf59a0 100644 --- a/cmd/flux/resume_source_chart.go +++ b/cmd/flux/resume_source_chart.go @@ -19,8 +19,9 @@ package main import ( "fmt" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var resumeSourceHelmChartCmd = &cobra.Command{ diff --git a/cmd/flux/resume_source_git.go b/cmd/flux/resume_source_git.go index 38033695..e67614d6 100644 --- a/cmd/flux/resume_source_git.go +++ b/cmd/flux/resume_source_git.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var resumeSourceGitCmd = &cobra.Command{ diff --git a/cmd/flux/resume_source_helm.go b/cmd/flux/resume_source_helm.go index 1dc10df4..1a9a10b6 100644 --- a/cmd/flux/resume_source_helm.go +++ b/cmd/flux/resume_source_helm.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var resumeSourceHelmCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_alert.go b/cmd/flux/suspend_alert.go index b063515d..f963bb88 100644 --- a/cmd/flux/suspend_alert.go +++ b/cmd/flux/suspend_alert.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var suspendAlertCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_helmrelease.go b/cmd/flux/suspend_helmrelease.go index 3a558c02..11f88b82 100644 --- a/cmd/flux/suspend_helmrelease.go +++ b/cmd/flux/suspend_helmrelease.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" "github.com/spf13/cobra" + + helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" ) var suspendHrCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_kustomization.go b/cmd/flux/suspend_kustomization.go index 07bc9cd4..272c5d65 100644 --- a/cmd/flux/suspend_kustomization.go +++ b/cmd/flux/suspend_kustomization.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" "github.com/spf13/cobra" + + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" ) var suspendKsCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_receiver.go b/cmd/flux/suspend_receiver.go index 29ad198b..7223fd49 100644 --- a/cmd/flux/suspend_receiver.go +++ b/cmd/flux/suspend_receiver.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/spf13/cobra" + + notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" ) var suspendReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_source_bucket.go b/cmd/flux/suspend_source_bucket.go index e75e3901..523d41a8 100644 --- a/cmd/flux/suspend_source_bucket.go +++ b/cmd/flux/suspend_source_bucket.go @@ -17,8 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var suspendSourceBucketCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_source_chart.go b/cmd/flux/suspend_source_chart.go index 72152bfd..8741a032 100644 --- a/cmd/flux/suspend_source_chart.go +++ b/cmd/flux/suspend_source_chart.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" - "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var suspendSourceHelmChartCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_source_git.go b/cmd/flux/suspend_source_git.go index df122911..9cc08fa2 100644 --- a/cmd/flux/suspend_source_git.go +++ b/cmd/flux/suspend_source_git.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" - "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var suspendSourceGitCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_source_helm.go b/cmd/flux/suspend_source_helm.go index 1b6e291e..5cd483f6 100644 --- a/cmd/flux/suspend_source_helm.go +++ b/cmd/flux/suspend_source_helm.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" - "github.com/spf13/cobra" + + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var suspendSourceHelmCmd = &cobra.Command{