diff --git a/cmd/flux/alert.go b/cmd/flux/alert.go index e0bc28879314974bdab3c30b4160c67ba3573a47..1ccb94f5ef6d736df7683eead266c4e4c9129d8c 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 c2722ff009206dd355a3885e912773756f975237..07963b05ecf3b4d5e6694ed950c013e96f69851c 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 bbce1356ab680d0ae7c40db438c1020f8f93c410..3b1ac9ce25e8f0b761682597d539366ad538c642 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 bd24b7b6ef798515f9503df23bcd16205549d88a..c1de6fea04446497cb838aafb6f428b54696f5a9 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 6d91861ad72cfaf71864f646236481fc57a792b8..05ad157afe05540716d495557de9c455cba5a7a3 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 8be71f41915794694e2be8af913d483fe96addcc..5e03ad9526291671b7da28df45ebb409e3b9ff51 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 11f45192ad4b4c52086c8ef0a1e20e21a3240c7d..5806b6df8ff30c92beadf90ac03543cba1c6cc3b 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 2c19e729cdf0047680460d565d7700205321c105..3549efb98cbca247d2451dcfe4ced6c56b62173a 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 c512367280ef172d4408a896439f5690a7689f60..36e4303a011e2ab363113b06a30dd4d0ceeaa299 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 b6e9eff3cec11a6845b1eab1e35a902261759ce4..35cc2ad073ff2d679bafa8a823d73514d894ddb0 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 074a43e17a0f27b971267276c3f8f55967ef7b3c..32b660e2c5340a139df04f3653e65b1983938199 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 4288107e66499f072fc8c9e65211cd2ebb1358cd..ddb6fe2fdf7ad7f59f5dc102e21e79204f6b6070 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 2a5d90bb997fab5a2b38c2518158061be116a7ff..961caa3c4b4689bfbf0c133aad45abc74f9f246b 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 7ff3fa825f7e7fb29fded9adabd7a859ae49ba9c..d6f4e1db8613c01a7c9f3c5ea5fadf354a2a349a 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 4a798ebf686e68e82ff672f971a96c6ea12620d9..54c8e75debefa99d2a131b7be32b06b001dc5e75 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 ab75a156386b9b430ecfe35f4532ceedd97f03d6..74d018b2f768582aea17249b37e81ba0e79d2a01 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 6d9652df167fa9c8252d40bced760a97ad234273..7a7039c180c717889f2167c8950fb249b676c32f 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 aeda9cd8fbb3c658681aa6136794e01c6093c6c1..7f0691930aa309603c864a32358a419ba62c1984 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 e12d1f8072116d7319f0dd4e02690a1a23ab7aa2..62499987b6b8588ea9398159c3d815132a911e0d 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 279dd60245bd7f69610ac953659891ee729d05bd..4b4f547835255a60ba2b1c3bf51804d6b325ddf2 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 6a7756d0b8927568464ccd17cfd1c0f1709e7400..05128b5367a5cff2228710e45a14f4a391f32c74 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 79162beb0a37e73811c4dcebbc6baffa13d4150d..5f3c072816e89b464003d7e4b1b2a0722f126509 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 570b428e30d5b825a5363e525d37d11ba177ecd8..0961763ed1f0d7417dae930d67b411f1fbd04c90 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 7009458f13e98859f91fad79be6a538c303b4c5b..4e72446e7faf8d2fcf16b540360ce560d95cfce5 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 8a64725ead17936d75a37a5160f4479efab69e20..55770de52936562d357b02cfa0493de7f6f8bf18 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 f487d2d3e291c2eac8f5e6145be41424b0d188fc..58b55acc8e8961a8f17576069f8dd2bbd09061a5 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 4e06acbcd1bfc9f8e4a20b4f36383f9f174065be..3439034ee2c3d0abc49afc040e8e112ead82b062 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 f75982d05b86350ab241b355970c880d4fda32a0..f58994c9abb9725c712f7eebf25529ad662845d1 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 63f22d8351116c0f375a4a02eeb9bd1c98b96b17..1c2f64e99625b5ce4e852bd78a1bd3fb57191440 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 109dc3f69741cc0c6be2869100cd66874fc5d242..91a30d22cce0a96764c63fd5b5fb7f859d59333e 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 49cdbace115e7f68cb5d198dd94b571fccc8ab5c..35976108c65fd62e94c407389ddf452cf2a4cbe9 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 3de4cbb3597ab3255b635ded48d2d92cbdc7c2b2..1662e5586e25067bd9a8d8c2ab07fcea0751fe90 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 574f8064a85d9eb4380f1b9963119c3970d0b0ac..8b5280afecf20ad8f5ec46b26b82e6b610ea4fcf 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 f7ce7481eca31f17705fe36417450838c45ca665..2bc79c9c82874e0b33acd6534c480df557848e9b 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 14d6f3793142ad5c32556c8f9d39ad33fdb486f5..ccf68bdbd505284c16f21895fdb04bd51945354f 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 ed42451fa201525d6479df0e15b6b7dc985b7801..79ef2f8ee16c646b64753739839facb48172d32e 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 f2a1c5b1af3594b42eaf5c74a093e3a21a523cc3..4644fcf96ca8ebcc32aeee822b6fdbc3a049aeaa 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 39e45ed5364ae3126388804768bf1ac75e8508b5..8ec849def83b7c507d19092fa93fbd885d9034c4 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 3955747cb84cef5f0650236f3f38762f7e75bbc9..6fa346baa69a0b7ec46edc3ec246f17fc0eec497 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 98eb67de1794074b4e384a83d2df2320bdce531e..9c01a8fce7bfcfd7b1c17dbe61ce81c592c83eb7 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 34455cef925da6db6056bfd216eeb47fe5ecefa9..736b924548026fe41c4280e1c9992879b4fb58a0 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 59ee5bfba72f83aa52ff8f318dd8b6fc1b8f2645..d99ef8f9addabf97508fc653cbf2b25c9fc97775 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 a2e3df31549c5bc0a24363aca9cf3034314ff160..b221ca0ef7b57959e036bb263fae5a779e5aca75 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 9cb51b05460aca7d6f5ddb5bcb9a9bd5f19accef..e2cff0fbd4f84f4ca017638056936c8273ec9b78 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 d3edc964360dc57140aeccc7f81dc9042256940a..ac2def275710a6d352aa62a81870e3af0e86d49b 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 1ce408a0a0ccd57dd806a79bbec0171b65155e1f..7bf37577b1a76dd1288716c6bca01bb6baab0a3a 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 a73b7a904968bfba4e2afa8029bfa6c00115b37c..a7a811244a3c5af9d3e51347a1ef60fcfd889ad1 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 c4d47f386d4267bf6b73091d169312dc5fcb2dd8..f2cf59a034905edc4bd466357e2f5454157d5903 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 38033695012dd0bb3662c563edc989b785b23736..e67614d60bb6dc205e9db369109f7f96fb12f7ee 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 1dc10df4a8da7607249d23486e2ca8295a7fd037..1a9a10b64885ccd29c9766c008914e282f9b5026 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 b063515d912b0b9e22c0d2fc2826c4f9bcb99965..f963bb882c2081ea36f2d1e6eeb318cbe9b16a5a 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 3a558c023843b708eaf68788628c6e909f7cd9a3..11f88b8280112c7457ad36d74c2b2382d1accc2e 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 07bc9cd40f4238afb66f4eea2e7aa284f44d6b90..272c5d6558cd1147d6c3e1b6512f18a1cc0c3e0a 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 29ad198b9a10667ba55e3aa1336ea037e969860d..7223fd495d92fc1f7e20804332f94858f878707b 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 e75e3901a204b975e70420083cf97d9feffe43a1..523d41a831d5bcb9adf72f025a546d53f587c0ab 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 72152bfde6cc3128e512d4e5222679db5949856a..8741a032698ec55274c1ecb7b5746577facc55cf 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 df122911a2d63ba93daa30ebefe482856b8ab659..9cc08fa2df14d794e970278085d42fe79c39c61e 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 1b6e291e34520748e35fe151ba38190f05c0c9f8..5cd483f646a96dd8036448f458d38db08d42f3fb 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{