From 34484734d805127ec57beac9ac10fc3151a33ff9 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Mon, 28 Jun 2021 16:19:52 +0100 Subject: [PATCH] Use image API v1beta1 Signed-off-by: Michael Bridgen --- cmd/flux/create_image_policy.go | 2 +- cmd/flux/create_image_repository.go | 2 +- cmd/flux/create_image_update.go | 2 +- cmd/flux/delete_image_policy.go | 2 +- cmd/flux/delete_image_repository.go | 2 +- cmd/flux/delete_image_update.go | 2 +- cmd/flux/export_image_policy.go | 2 +- cmd/flux/export_image_repository.go | 2 +- cmd/flux/export_image_update.go | 2 +- cmd/flux/get_image_all.go | 4 ++-- cmd/flux/get_image_policy.go | 2 +- cmd/flux/get_image_repository.go | 2 +- cmd/flux/get_image_update.go | 2 +- cmd/flux/image.go | 4 ++-- cmd/flux/reconcile_image_repository.go | 2 +- cmd/flux/reconcile_image_updateauto.go | 2 +- cmd/flux/resume_image_repository.go | 2 +- cmd/flux/resume_image_updateauto.go | 2 +- cmd/flux/suspend_image_repository.go | 2 +- cmd/flux/suspend_image_updateauto.go | 2 +- internal/utils/utils.go | 4 ++-- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/flux/create_image_policy.go b/cmd/flux/create_image_policy.go index 6fa79b22..77b47321 100644 --- a/cmd/flux/create_image_policy.go +++ b/cmd/flux/create_image_policy.go @@ -28,7 +28,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var createImagePolicyCmd = &cobra.Command{ diff --git a/cmd/flux/create_image_repository.go b/cmd/flux/create_image_repository.go index 033414b1..7619c8a6 100644 --- a/cmd/flux/create_image_repository.go +++ b/cmd/flux/create_image_repository.go @@ -26,7 +26,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var createImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/create_image_update.go b/cmd/flux/create_image_update.go index 4495c811..6ef81a28 100644 --- a/cmd/flux/create_image_update.go +++ b/cmd/flux/create_image_update.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) diff --git a/cmd/flux/delete_image_policy.go b/cmd/flux/delete_image_policy.go index 06f65c18..a11b7b59 100644 --- a/cmd/flux/delete_image_policy.go +++ b/cmd/flux/delete_image_policy.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var deleteImagePolicyCmd = &cobra.Command{ diff --git a/cmd/flux/delete_image_repository.go b/cmd/flux/delete_image_repository.go index 7193fa3d..10b85ff9 100644 --- a/cmd/flux/delete_image_repository.go +++ b/cmd/flux/delete_image_repository.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var deleteImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/delete_image_update.go b/cmd/flux/delete_image_update.go index 4fb4df5e..cede3840 100644 --- a/cmd/flux/delete_image_update.go +++ b/cmd/flux/delete_image_update.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" ) var deleteImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/export_image_policy.go b/cmd/flux/export_image_policy.go index bc57feea..6aa64f7b 100644 --- a/cmd/flux/export_image_policy.go +++ b/cmd/flux/export_image_policy.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var exportImagePolicyCmd = &cobra.Command{ diff --git a/cmd/flux/export_image_repository.go b/cmd/flux/export_image_repository.go index a8386bfd..7fad1da6 100644 --- a/cmd/flux/export_image_repository.go +++ b/cmd/flux/export_image_repository.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var exportImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/export_image_update.go b/cmd/flux/export_image_update.go index 3619c0a6..6d6fcffa 100644 --- a/cmd/flux/export_image_update.go +++ b/cmd/flux/export_image_update.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" ) var exportImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_all.go b/cmd/flux/get_image_all.go index 4e66b832..88c93ce0 100644 --- a/cmd/flux/get_image_all.go +++ b/cmd/flux/get_image_all.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var getImageAllCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_policy.go b/cmd/flux/get_image_policy.go index 6cf6f00d..9136ffaa 100644 --- a/cmd/flux/get_image_policy.go +++ b/cmd/flux/get_image_policy.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var getImagePolicyCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_repository.go b/cmd/flux/get_image_repository.go index 0a12d0a8..23461f21 100644 --- a/cmd/flux/get_image_repository.go +++ b/cmd/flux/get_image_repository.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var getImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_update.go b/cmd/flux/get_image_update.go index 3de8aa90..d6a5e540 100644 --- a/cmd/flux/get_image_update.go +++ b/cmd/flux/get_image_update.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" ) var getImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/image.go b/cmd/flux/image.go index 01a92f43..4727e4b2 100644 --- a/cmd/flux/image.go +++ b/cmd/flux/image.go @@ -19,8 +19,8 @@ package main import ( "sigs.k8s.io/controller-runtime/pkg/client" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) // These are general-purpose adapters for attaching methods to, for diff --git a/cmd/flux/reconcile_image_repository.go b/cmd/flux/reconcile_image_repository.go index 1314ded8..d2e4c087 100644 --- a/cmd/flux/reconcile_image_repository.go +++ b/cmd/flux/reconcile_image_repository.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var reconcileImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_image_updateauto.go b/cmd/flux/reconcile_image_updateauto.go index 453ad867..b1af0d56 100644 --- a/cmd/flux/reconcile_image_updateauto.go +++ b/cmd/flux/reconcile_image_updateauto.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" apimeta "k8s.io/apimachinery/pkg/api/meta" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" meta "github.com/fluxcd/pkg/apis/meta" ) diff --git a/cmd/flux/resume_image_repository.go b/cmd/flux/resume_image_repository.go index 3538a150..59349c55 100644 --- a/cmd/flux/resume_image_repository.go +++ b/cmd/flux/resume_image_repository.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var resumeImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/resume_image_updateauto.go b/cmd/flux/resume_image_updateauto.go index 79368ddc..c7e45d74 100644 --- a/cmd/flux/resume_image_updateauto.go +++ b/cmd/flux/resume_image_updateauto.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" ) var resumeImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_image_repository.go b/cmd/flux/suspend_image_repository.go index 768299e8..5651b799 100644 --- a/cmd/flux/suspend_image_repository.go +++ b/cmd/flux/suspend_image_repository.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" ) var suspendImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/suspend_image_updateauto.go b/cmd/flux/suspend_image_updateauto.go index 3d4f81b4..cc6c2ecf 100644 --- a/cmd/flux/suspend_image_updateauto.go +++ b/cmd/flux/suspend_image_updateauto.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" ) var suspendImageUpdateCmd = &cobra.Command{ diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 3e949c8b..f606f4eb 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -45,8 +45,8 @@ import ( "sigs.k8s.io/yaml" helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" - imageautov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2" - imagereflectv1 "github.com/fluxcd/image-reflector-controller/api/v1alpha2" + imageautov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + imagereflectv1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" "github.com/fluxcd/pkg/runtime/dependency"