diff --git a/cmd/flux/bootstrap.go b/cmd/flux/bootstrap.go index 09b4ec9d..2441551d 100644 --- a/cmd/flux/bootstrap.go +++ b/cmd/flux/bootstrap.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" ) var bootstrapCmd = &cobra.Command{ diff --git a/cmd/flux/bootstrap_bitbucket_server.go b/cmd/flux/bootstrap_bitbucket_server.go index ee56a32d..40eccca8 100644 --- a/cmd/flux/bootstrap_bitbucket_server.go +++ b/cmd/flux/bootstrap_bitbucket_server.go @@ -26,14 +26,14 @@ import ( "github.com/fluxcd/pkg/git/gogit" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/bootstrap" - "github.com/fluxcd/flux2/pkg/bootstrap/provider" - "github.com/fluxcd/flux2/pkg/manifestgen" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" - "github.com/fluxcd/flux2/pkg/manifestgen/sync" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/bootstrap" + "github.com/fluxcd/flux2/v2/pkg/bootstrap/provider" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sync" ) var bootstrapBServerCmd = &cobra.Command{ diff --git a/cmd/flux/bootstrap_git.go b/cmd/flux/bootstrap_git.go index 3d1dd255..4a6234ca 100644 --- a/cmd/flux/bootstrap_git.go +++ b/cmd/flux/bootstrap_git.go @@ -28,13 +28,13 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/bootstrap" - "github.com/fluxcd/flux2/pkg/manifestgen" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" - "github.com/fluxcd/flux2/pkg/manifestgen/sync" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/bootstrap" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sync" "github.com/fluxcd/pkg/git" "github.com/fluxcd/pkg/git/gogit" ) diff --git a/cmd/flux/bootstrap_github.go b/cmd/flux/bootstrap_github.go index e015e4bb..8c7c214e 100644 --- a/cmd/flux/bootstrap_github.go +++ b/cmd/flux/bootstrap_github.go @@ -26,14 +26,14 @@ import ( "github.com/fluxcd/pkg/git/gogit" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/bootstrap" - "github.com/fluxcd/flux2/pkg/bootstrap/provider" - "github.com/fluxcd/flux2/pkg/manifestgen" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" - "github.com/fluxcd/flux2/pkg/manifestgen/sync" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/bootstrap" + "github.com/fluxcd/flux2/v2/pkg/bootstrap/provider" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sync" ) var bootstrapGitHubCmd = &cobra.Command{ diff --git a/cmd/flux/bootstrap_gitlab.go b/cmd/flux/bootstrap_gitlab.go index 34d877a0..6bb111c3 100644 --- a/cmd/flux/bootstrap_gitlab.go +++ b/cmd/flux/bootstrap_gitlab.go @@ -28,14 +28,14 @@ import ( "github.com/fluxcd/pkg/git/gogit" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/bootstrap" - "github.com/fluxcd/flux2/pkg/bootstrap/provider" - "github.com/fluxcd/flux2/pkg/manifestgen" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" - "github.com/fluxcd/flux2/pkg/manifestgen/sync" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/bootstrap" + "github.com/fluxcd/flux2/v2/pkg/bootstrap/provider" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sync" ) var bootstrapGitLabCmd = &cobra.Command{ diff --git a/cmd/flux/build_kustomization.go b/cmd/flux/build_kustomization.go index 516fadd8..507fb94c 100644 --- a/cmd/flux/build_kustomization.go +++ b/cmd/flux/build_kustomization.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/build" + "github.com/fluxcd/flux2/v2/internal/build" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" ) diff --git a/cmd/flux/check.go b/cmd/flux/check.go index 1aa0a44e..c29b1af5 100644 --- a/cmd/flux/check.go +++ b/cmd/flux/check.go @@ -30,10 +30,10 @@ import ( "github.com/fluxcd/pkg/version" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/status" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/status" ) var checkCmd = &cobra.Command{ diff --git a/cmd/flux/check_test.go b/cmd/flux/check_test.go index 50aac200..e5745915 100644 --- a/cmd/flux/check_test.go +++ b/cmd/flux/check_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) func TestCheckPre(t *testing.T) { diff --git a/cmd/flux/completion.go b/cmd/flux/completion.go index c24c16be..e75a1b19 100644 --- a/cmd/flux/completion.go +++ b/cmd/flux/completion.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cmd/flux/create.go b/cmd/flux/create.go index b0eb0e83..74e091b1 100644 --- a/cmd/flux/create.go +++ b/cmd/flux/create.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var createCmd = &cobra.Command{ diff --git a/cmd/flux/create_alert.go b/cmd/flux/create_alert.go index 5f4e2164..a50298f4 100644 --- a/cmd/flux/create_alert.go +++ b/cmd/flux/create_alert.go @@ -32,7 +32,7 @@ import ( notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2" "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var createAlertCmd = &cobra.Command{ diff --git a/cmd/flux/create_alertprovider.go b/cmd/flux/create_alertprovider.go index 915997c4..2de24341 100644 --- a/cmd/flux/create_alertprovider.go +++ b/cmd/flux/create_alertprovider.go @@ -31,7 +31,7 @@ import ( notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2" "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var createAlertProviderCmd = &cobra.Command{ diff --git a/cmd/flux/create_helmrelease.go b/cmd/flux/create_helmrelease.go index 62ca40c2..da3e6f67 100644 --- a/cmd/flux/create_helmrelease.go +++ b/cmd/flux/create_helmrelease.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/runtime/transform" diff --git a/cmd/flux/create_kustomization.go b/cmd/flux/create_kustomization.go index b88f243b..0a4ed533 100644 --- a/cmd/flux/create_kustomization.go +++ b/cmd/flux/create_kustomization.go @@ -34,8 +34,8 @@ import ( kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" ) var createKsCmd = &cobra.Command{ diff --git a/cmd/flux/create_receiver.go b/cmd/flux/create_receiver.go index 0114582e..d7f3d74a 100644 --- a/cmd/flux/create_receiver.go +++ b/cmd/flux/create_receiver.go @@ -31,7 +31,7 @@ import ( notificationv1 "github.com/fluxcd/notification-controller/api/v1" "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var createReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/create_secret_git.go b/cmd/flux/create_secret_git.go index b8bf05bb..3bf7222a 100644 --- a/cmd/flux/create_secret_git.go +++ b/cmd/flux/create_secret_git.go @@ -27,9 +27,9 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" ) var createSecretGitCmd = &cobra.Command{ diff --git a/cmd/flux/create_secret_helm.go b/cmd/flux/create_secret_helm.go index aba9e734..9833b449 100644 --- a/cmd/flux/create_secret_helm.go +++ b/cmd/flux/create_secret_helm.go @@ -25,8 +25,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" ) var createSecretHelmCmd = &cobra.Command{ diff --git a/cmd/flux/create_secret_oci.go b/cmd/flux/create_secret_oci.go index b7cb3449..09a689f0 100644 --- a/cmd/flux/create_secret_oci.go +++ b/cmd/flux/create_secret_oci.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" diff --git a/cmd/flux/create_secret_tls.go b/cmd/flux/create_secret_tls.go index 640fef5d..ed4eb9fe 100644 --- a/cmd/flux/create_secret_tls.go +++ b/cmd/flux/create_secret_tls.go @@ -26,8 +26,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" ) var createSecretTLSCmd = &cobra.Command{ diff --git a/cmd/flux/create_source_bucket.go b/cmd/flux/create_source_bucket.go index e528deed..0697aa3c 100644 --- a/cmd/flux/create_source_bucket.go +++ b/cmd/flux/create_source_bucket.go @@ -35,8 +35,8 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" ) var createSourceBucketCmd = &cobra.Command{ diff --git a/cmd/flux/create_source_git.go b/cmd/flux/create_source_git.go index 83d895dd..2c6cc59a 100644 --- a/cmd/flux/create_source_git.go +++ b/cmd/flux/create_source_git.go @@ -39,9 +39,9 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" ) type sourceGitFlags struct { diff --git a/cmd/flux/create_source_helm.go b/cmd/flux/create_source_helm.go index 49a4b026..43373b8d 100644 --- a/cmd/flux/create_source_helm.go +++ b/cmd/flux/create_source_helm.go @@ -35,8 +35,8 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" ) var createSourceHelmCmd = &cobra.Command{ diff --git a/cmd/flux/create_source_oci.go b/cmd/flux/create_source_oci.go index 59b6fc86..d048f367 100644 --- a/cmd/flux/create_source_oci.go +++ b/cmd/flux/create_source_oci.go @@ -33,8 +33,8 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" ) var createSourceOCIRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/create_tenant.go b/cmd/flux/create_tenant.go index deb62f90..79ffdb82 100644 --- a/cmd/flux/create_tenant.go +++ b/cmd/flux/create_tenant.go @@ -21,7 +21,7 @@ import ( "context" "fmt" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/cmd/flux/delete.go b/cmd/flux/delete.go index ae808b77..eb1079bc 100644 --- a/cmd/flux/delete.go +++ b/cmd/flux/delete.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var deleteCmd = &cobra.Command{ diff --git a/cmd/flux/diff_artifact.go b/cmd/flux/diff_artifact.go index ddf6d94b..430f5497 100644 --- a/cmd/flux/diff_artifact.go +++ b/cmd/flux/diff_artifact.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/fluxcd/flux2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/flags" oci "github.com/fluxcd/pkg/oci/client" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/spf13/cobra" diff --git a/cmd/flux/diff_kustomization.go b/cmd/flux/diff_kustomization.go index 8b406417..25ca0097 100644 --- a/cmd/flux/diff_kustomization.go +++ b/cmd/flux/diff_kustomization.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/build" + "github.com/fluxcd/flux2/v2/internal/build" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" ) diff --git a/cmd/flux/diff_kustomization_test.go b/cmd/flux/diff_kustomization_test.go index 1c92268c..fc2a9c67 100644 --- a/cmd/flux/diff_kustomization_test.go +++ b/cmd/flux/diff_kustomization_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/fluxcd/flux2/internal/build" + "github.com/fluxcd/flux2/v2/internal/build" "github.com/fluxcd/pkg/ssa" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/cmd/flux/events.go b/cmd/flux/events.go index 3017a2db..c534dfd0 100644 --- a/cmd/flux/events.go +++ b/cmd/flux/events.go @@ -48,8 +48,8 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/printers" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/printers" ) var eventsCmd = &cobra.Command{ diff --git a/cmd/flux/events_test.go b/cmd/flux/events_test.go index cbd098b9..a6977431 100644 --- a/cmd/flux/events_test.go +++ b/cmd/flux/events_test.go @@ -43,7 +43,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var objects = ` diff --git a/cmd/flux/export.go b/cmd/flux/export.go index bfb2b60b..c537156c 100644 --- a/cmd/flux/export.go +++ b/cmd/flux/export.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var exportCmd = &cobra.Command{ diff --git a/cmd/flux/export_secret.go b/cmd/flux/export_secret.go index 1c9e475d..4a87e233 100644 --- a/cmd/flux/export_secret.go +++ b/cmd/flux/export_secret.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) // exportableWithSecret represents a type that you can fetch from the Kubernetes diff --git a/cmd/flux/get.go b/cmd/flux/get.go index 6723fb22..1442f3af 100644 --- a/cmd/flux/get.go +++ b/cmd/flux/get.go @@ -32,8 +32,8 @@ import ( "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/printers" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/printers" ) type deriveType func(runtime.Object) (summarisable, error) diff --git a/cmd/flux/get_kustomization.go b/cmd/flux/get_kustomization.go index 9ce5381a..7da038d5 100644 --- a/cmd/flux/get_kustomization.go +++ b/cmd/flux/get_kustomization.go @@ -26,7 +26,7 @@ import ( kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var getKsCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_bucket.go b/cmd/flux/get_source_bucket.go index b1b283c4..93d159d8 100644 --- a/cmd/flux/get_source_bucket.go +++ b/cmd/flux/get_source_bucket.go @@ -26,7 +26,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var getSourceBucketCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_chart.go b/cmd/flux/get_source_chart.go index bb275f60..3f9f5948 100644 --- a/cmd/flux/get_source_chart.go +++ b/cmd/flux/get_source_chart.go @@ -26,7 +26,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var getSourceHelmChartCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_git.go b/cmd/flux/get_source_git.go index 623da707..15e07bc5 100644 --- a/cmd/flux/get_source_git.go +++ b/cmd/flux/get_source_git.go @@ -26,7 +26,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var getSourceGitCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_helm.go b/cmd/flux/get_source_helm.go index 2ac0f0f9..161ae8a0 100644 --- a/cmd/flux/get_source_helm.go +++ b/cmd/flux/get_source_helm.go @@ -26,7 +26,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var getSourceHelmCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_oci.go b/cmd/flux/get_source_oci.go index aac2a60e..0a97935f 100644 --- a/cmd/flux/get_source_oci.go +++ b/cmd/flux/get_source_oci.go @@ -26,7 +26,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var getSourceOCIRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/install.go b/cmd/flux/install.go index 4c645640..53712021 100644 --- a/cmd/flux/install.go +++ b/cmd/flux/install.go @@ -25,11 +25,11 @@ import ( "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/status" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/status" ) var installCmd = &cobra.Command{ diff --git a/cmd/flux/list_artifact.go b/cmd/flux/list_artifact.go index f2b2f75c..bdc040c6 100644 --- a/cmd/flux/list_artifact.go +++ b/cmd/flux/list_artifact.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" - "github.com/fluxcd/flux2/pkg/printers" oci "github.com/fluxcd/pkg/oci/client" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/pkg/printers" ) type listArtifactFlags struct { diff --git a/cmd/flux/logs.go b/cmd/flux/logs.go index 6acc65f6..6f69e0d0 100644 --- a/cmd/flux/logs.go +++ b/cmd/flux/logs.go @@ -37,9 +37,9 @@ import ( "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/podutils" - "github.com/fluxcd/flux2/internal/flags" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" ) var logsCmd = &cobra.Command{ diff --git a/cmd/flux/main.go b/cmd/flux/main.go index cc3d9553..4dd2fae8 100644 --- a/cmd/flux/main.go +++ b/cmd/flux/main.go @@ -33,7 +33,7 @@ import ( runclient "github.com/fluxcd/pkg/runtime/client" - "github.com/fluxcd/flux2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" ) var VERSION = "0.0.0-dev.0" diff --git a/cmd/flux/main_e2e_test.go b/cmd/flux/main_e2e_test.go index 22e27fdf..1cfa3ace 100644 --- a/cmd/flux/main_e2e_test.go +++ b/cmd/flux/main_e2e_test.go @@ -25,7 +25,7 @@ import ( "os" "testing" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) func TestMain(m *testing.M) { diff --git a/cmd/flux/main_test.go b/cmd/flux/main_test.go index b7e675d7..d153d479 100644 --- a/cmd/flux/main_test.go +++ b/cmd/flux/main_test.go @@ -31,7 +31,7 @@ import ( "text/template" "time" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" "github.com/google/go-cmp/cmp" "github.com/mattn/go-shellwords" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/cmd/flux/pull_artifact.go b/cmd/flux/pull_artifact.go index 2fa0eab3..529d5557 100644 --- a/cmd/flux/pull_artifact.go +++ b/cmd/flux/pull_artifact.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/fluxcd/flux2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/flags" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/spf13/cobra" diff --git a/cmd/flux/push_artifact.go b/cmd/flux/push_artifact.go index 58f386ab..6a0245bc 100644 --- a/cmd/flux/push_artifact.go +++ b/cmd/flux/push_artifact.go @@ -23,7 +23,7 @@ import ( "os" "strings" - "github.com/fluxcd/flux2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/flags" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" reg "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" diff --git a/cmd/flux/reconcile.go b/cmd/flux/reconcile.go index 6221e117..1133d2a1 100644 --- a/cmd/flux/reconcile.go +++ b/cmd/flux/reconcile.go @@ -34,7 +34,7 @@ import ( notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2" "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var reconcileCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_alertprovider.go b/cmd/flux/reconcile_alertprovider.go index 86a737b7..becf980f 100644 --- a/cmd/flux/reconcile_alertprovider.go +++ b/cmd/flux/reconcile_alertprovider.go @@ -28,7 +28,7 @@ import ( notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2" "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var reconcileAlertProviderCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_receiver.go b/cmd/flux/reconcile_receiver.go index cb415627..8a04ea7a 100644 --- a/cmd/flux/reconcile_receiver.go +++ b/cmd/flux/reconcile_receiver.go @@ -28,7 +28,7 @@ import ( notificationv1 "github.com/fluxcd/notification-controller/api/v1" "github.com/fluxcd/pkg/apis/meta" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var reconcileReceiverCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_with_source.go b/cmd/flux/reconcile_with_source.go index 0eda5f60..4c3a7eac 100644 --- a/cmd/flux/reconcile_with_source.go +++ b/cmd/flux/reconcile_with_source.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" "github.com/fluxcd/pkg/apis/meta" ) diff --git a/cmd/flux/resume.go b/cmd/flux/resume.go index 368c5e59..becf4f2f 100644 --- a/cmd/flux/resume.go +++ b/cmd/flux/resume.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var resumeCmd = &cobra.Command{ diff --git a/cmd/flux/stats.go b/cmd/flux/stats.go index 78692fbe..b726e343 100644 --- a/cmd/flux/stats.go +++ b/cmd/flux/stats.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/cli-utils/pkg/kstatus/status" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/printers" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/printers" helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" diff --git a/cmd/flux/suspend.go b/cmd/flux/suspend.go index 58f7a962..85e93de9 100644 --- a/cmd/flux/suspend.go +++ b/cmd/flux/suspend.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var suspendCmd = &cobra.Command{ diff --git a/cmd/flux/tag_artifact.go b/cmd/flux/tag_artifact.go index f0ca6f5d..e942c530 100644 --- a/cmd/flux/tag_artifact.go +++ b/cmd/flux/tag_artifact.go @@ -25,7 +25,7 @@ import ( oci "github.com/fluxcd/pkg/oci/client" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/flags" + "github.com/fluxcd/flux2/v2/internal/flags" ) var tagArtifactCmd = &cobra.Command{ diff --git a/cmd/flux/trace.go b/cmd/flux/trace.go index 8a5dd02b..a2839e4f 100644 --- a/cmd/flux/trace.go +++ b/cmd/flux/trace.go @@ -33,7 +33,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" fluxmeta "github.com/fluxcd/pkg/apis/meta" diff --git a/cmd/flux/tree_kustomization.go b/cmd/flux/tree_kustomization.go index 7fcae1c4..8b5987f6 100644 --- a/cmd/flux/tree_kustomization.go +++ b/cmd/flux/tree_kustomization.go @@ -39,8 +39,8 @@ import ( kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" "github.com/fluxcd/pkg/ssa" - "github.com/fluxcd/flux2/internal/tree" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/tree" + "github.com/fluxcd/flux2/v2/internal/utils" ) var treeKsCmd = &cobra.Command{ diff --git a/cmd/flux/uninstall.go b/cmd/flux/uninstall.go index 21bcd3b3..15e7b6bb 100644 --- a/cmd/flux/uninstall.go +++ b/cmd/flux/uninstall.go @@ -23,8 +23,8 @@ import ( "github.com/manifoldco/promptui" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/uninstall" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/uninstall" ) var uninstallCmd = &cobra.Command{ diff --git a/cmd/flux/version.go b/cmd/flux/version.go index 8d563dc1..cb113d67 100644 --- a/cmd/flux/version.go +++ b/cmd/flux/version.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" ) var versionCmd = &cobra.Command{ diff --git a/cmd/flux/version_utils.go b/cmd/flux/version_utils.go index 64b52ccf..5bf8326e 100644 --- a/cmd/flux/version_utils.go +++ b/cmd/flux/version_utils.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" ) func getVersion(input string) (string, error) { diff --git a/go.mod b/go.mod index a2783499..1a8235cb 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/fluxcd/flux2 +module github.com/fluxcd/flux2/v2 go 1.18 diff --git a/internal/build/build.go b/internal/build/build.go index 0c6baf77..083a7ca4 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -45,7 +45,7 @@ import ( runclient "github.com/fluxcd/pkg/runtime/client" "sigs.k8s.io/kustomize/kyaml/filesys" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) const ( diff --git a/internal/build/diff.go b/internal/build/diff.go index d81e22b6..b510b129 100644 --- a/internal/build/diff.go +++ b/internal/build/diff.go @@ -41,7 +41,7 @@ import ( "github.com/fluxcd/pkg/ssa" - "github.com/fluxcd/flux2/pkg/printers" + "github.com/fluxcd/flux2/v2/pkg/printers" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" ) diff --git a/internal/flags/crds.go b/internal/flags/crds.go index 47e05e4f..aa7eee61 100644 --- a/internal/flags/crds.go +++ b/internal/flags/crds.go @@ -22,7 +22,7 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var supportedCRDsPolicies = []string{ diff --git a/internal/flags/decryption_provider.go b/internal/flags/decryption_provider.go index 9a416467..085340ab 100644 --- a/internal/flags/decryption_provider.go +++ b/internal/flags/decryption_provider.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var supportedDecryptionProviders = []string{"sops"} diff --git a/internal/flags/helm_chart_source.go b/internal/flags/helm_chart_source.go index 2a910d02..1ec99408 100644 --- a/internal/flags/helm_chart_source.go +++ b/internal/flags/helm_chart_source.go @@ -23,7 +23,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var supportedHelmChartSourceKinds = []string{sourcev1b2.HelmRepositoryKind, sourcev1.GitRepositoryKind, sourcev1b2.BucketKind} diff --git a/internal/flags/kustomization_source.go b/internal/flags/kustomization_source.go index 6342bf68..322285e1 100644 --- a/internal/flags/kustomization_source.go +++ b/internal/flags/kustomization_source.go @@ -23,7 +23,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var supportedKustomizationSourceKinds = []string{sourcev1b2.OCIRepositoryKind, sourcev1.GitRepositoryKind, sourcev1b2.BucketKind} diff --git a/internal/flags/log_level.go b/internal/flags/log_level.go index bd880fff..4101a902 100644 --- a/internal/flags/log_level.go +++ b/internal/flags/log_level.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" ) var supportedLogLevels = []string{"debug", "info", "error"} diff --git a/internal/flags/source_bucket_provider.go b/internal/flags/source_bucket_provider.go index 6e2bfaa5..5ab08ecb 100644 --- a/internal/flags/source_bucket_provider.go +++ b/internal/flags/source_bucket_provider.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" ) diff --git a/internal/flags/source_oci_provider.go b/internal/flags/source_oci_provider.go index 04d9b79a..77ff0441 100644 --- a/internal/flags/source_oci_provider.go +++ b/internal/flags/source_oci_provider.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/v2/internal/utils" "github.com/fluxcd/pkg/oci" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" ) diff --git a/internal/utils/apply.go b/internal/utils/apply.go index 1979759b..c910fce3 100644 --- a/internal/utils/apply.go +++ b/internal/utils/apply.go @@ -31,7 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/kustomize/api/konfig" - "github.com/fluxcd/flux2/pkg/manifestgen/kustomization" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/kustomization" runclient "github.com/fluxcd/pkg/runtime/client" "github.com/fluxcd/pkg/ssa" ) diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 8f25730c..c5d8ec88 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -53,7 +53,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" ) type ExecMode string diff --git a/pkg/bootstrap/bootstrap.go b/pkg/bootstrap/bootstrap.go index ae6a792c..5d10b724 100644 --- a/pkg/bootstrap/bootstrap.go +++ b/pkg/bootstrap/bootstrap.go @@ -34,9 +34,9 @@ import ( "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" - "github.com/fluxcd/flux2/pkg/manifestgen/sync" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sync" ) var ( diff --git a/pkg/bootstrap/bootstrap_plain_git.go b/pkg/bootstrap/bootstrap_plain_git.go index 7239ac3e..bd3281c2 100644 --- a/pkg/bootstrap/bootstrap_plain_git.go +++ b/pkg/bootstrap/bootstrap_plain_git.go @@ -40,13 +40,13 @@ import ( "github.com/fluxcd/pkg/kustomize/filesys" runclient "github.com/fluxcd/pkg/runtime/client" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/flux2/pkg/log" - "github.com/fluxcd/flux2/pkg/manifestgen/install" - "github.com/fluxcd/flux2/pkg/manifestgen/kustomization" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" - "github.com/fluxcd/flux2/pkg/manifestgen/sync" - "github.com/fluxcd/flux2/pkg/status" + "github.com/fluxcd/flux2/v2/internal/utils" + "github.com/fluxcd/flux2/v2/pkg/log" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/kustomization" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sync" + "github.com/fluxcd/flux2/v2/pkg/status" "github.com/fluxcd/pkg/git" "github.com/fluxcd/pkg/git/repository" ) diff --git a/pkg/bootstrap/bootstrap_provider.go b/pkg/bootstrap/bootstrap_provider.go index 74aa48ef..672f3f11 100644 --- a/pkg/bootstrap/bootstrap_provider.go +++ b/pkg/bootstrap/bootstrap_provider.go @@ -29,9 +29,9 @@ import ( "github.com/fluxcd/go-git-providers/gitprovider" - "github.com/fluxcd/flux2/pkg/bootstrap/provider" - "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" - "github.com/fluxcd/flux2/pkg/manifestgen/sync" + "github.com/fluxcd/flux2/v2/pkg/bootstrap/provider" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/sync" "github.com/fluxcd/pkg/git/repository" ) diff --git a/pkg/bootstrap/options.go b/pkg/bootstrap/options.go index 8b6ee790..27830f4a 100644 --- a/pkg/bootstrap/options.go +++ b/pkg/bootstrap/options.go @@ -26,7 +26,7 @@ import ( "github.com/fluxcd/pkg/git" runclient "github.com/fluxcd/pkg/runtime/client" - "github.com/fluxcd/flux2/pkg/log" + "github.com/fluxcd/flux2/v2/pkg/log" ) type Option interface { diff --git a/pkg/manifestgen/install/install.go b/pkg/manifestgen/install/install.go index 80621782..7742e041 100644 --- a/pkg/manifestgen/install/install.go +++ b/pkg/manifestgen/install/install.go @@ -28,7 +28,7 @@ import ( securejoin "github.com/cyphar/filepath-securejoin" - "github.com/fluxcd/flux2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" ) // Generate returns the install manifests as a multi-doc YAML. diff --git a/pkg/manifestgen/install/manifests.go b/pkg/manifestgen/install/manifests.go index 17fc33f1..f607f232 100644 --- a/pkg/manifestgen/install/manifests.go +++ b/pkg/manifestgen/install/manifests.go @@ -29,7 +29,7 @@ import ( "github.com/fluxcd/pkg/kustomize/filesys" "github.com/fluxcd/pkg/untar" - "github.com/fluxcd/flux2/pkg/manifestgen/kustomization" + "github.com/fluxcd/flux2/v2/pkg/manifestgen/kustomization" ) func fetch(ctx context.Context, url, version, dir string) error { diff --git a/pkg/manifestgen/kustomization/kustomization.go b/pkg/manifestgen/kustomization/kustomization.go index 058049b7..383361d1 100644 --- a/pkg/manifestgen/kustomization/kustomization.go +++ b/pkg/manifestgen/kustomization/kustomization.go @@ -31,7 +31,7 @@ import ( "github.com/fluxcd/pkg/kustomize/filesys" - "github.com/fluxcd/flux2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" ) // Generate scans the given directory for Kubernetes manifests and creates a diff --git a/pkg/manifestgen/sourcesecret/sourcesecret.go b/pkg/manifestgen/sourcesecret/sourcesecret.go index 5c0d40d1..41849b70 100644 --- a/pkg/manifestgen/sourcesecret/sourcesecret.go +++ b/pkg/manifestgen/sourcesecret/sourcesecret.go @@ -33,7 +33,7 @@ import ( "github.com/fluxcd/pkg/ssh" - "github.com/fluxcd/flux2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" ) const defaultSSHPort = 22 diff --git a/pkg/manifestgen/sync/sync.go b/pkg/manifestgen/sync/sync.go index b24e6085..26de1827 100644 --- a/pkg/manifestgen/sync/sync.go +++ b/pkg/manifestgen/sync/sync.go @@ -30,7 +30,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/flux2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" ) func Generate(options Options) (*manifestgen.Manifest, error) { diff --git a/pkg/status/status.go b/pkg/status/status.go index ce227a6d..a016cca8 100644 --- a/pkg/status/status.go +++ b/pkg/status/status.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - "github.com/fluxcd/flux2/pkg/log" + "github.com/fluxcd/flux2/v2/pkg/log" ) type StatusChecker struct { diff --git a/pkg/uninstall/uninstall.go b/pkg/uninstall/uninstall.go index 497e1a72..3293cc9c 100644 --- a/pkg/uninstall/uninstall.go +++ b/pkg/uninstall/uninstall.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/fluxcd/flux2/pkg/log" - "github.com/fluxcd/flux2/pkg/manifestgen" + "github.com/fluxcd/flux2/v2/pkg/log" + "github.com/fluxcd/flux2/v2/pkg/manifestgen" helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"