diff --git a/cmd/flux/create_image_policy.go b/cmd/flux/create_image_policy.go index dc87dea6..20ce1cf6 100644 --- a/cmd/flux/create_image_policy.go +++ b/cmd/flux/create_image_policy.go @@ -29,7 +29,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var createImagePolicyCmd = &cobra.Command{ diff --git a/cmd/flux/create_image_repository.go b/cmd/flux/create_image_repository.go index d4ce1fe6..73bb877d 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var createImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/delete_image_policy.go b/cmd/flux/delete_image_policy.go index b99432ee..caa049a5 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var deleteImagePolicyCmd = &cobra.Command{ diff --git a/cmd/flux/delete_image_repository.go b/cmd/flux/delete_image_repository.go index de5388a6..8878ed7e 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var deleteImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/events.go b/cmd/flux/events.go index dc0bbd66..04ee62b6 100644 --- a/cmd/flux/events.go +++ b/cmd/flux/events.go @@ -41,7 +41,7 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2" autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" diff --git a/cmd/flux/events_test.go b/cmd/flux/events_test.go index 151cd55c..e2b396d9 100644 --- a/cmd/flux/events_test.go +++ b/cmd/flux/events_test.go @@ -140,7 +140,7 @@ spec: address: https://hooks.slack.com/services/mock type: slack --- -apiVersion: image.toolkit.fluxcd.io/v1beta2 +apiVersion: image.toolkit.fluxcd.io/v1 kind: ImagePolicy metadata: name: podinfo diff --git a/cmd/flux/export_image_policy.go b/cmd/flux/export_image_policy.go index 7bc24273..72f08e92 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var exportImagePolicyCmd = &cobra.Command{ diff --git a/cmd/flux/export_image_repository.go b/cmd/flux/export_image_repository.go index 29485789..a94f8928 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var exportImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_all.go b/cmd/flux/get_image_all.go index 586e7cf1..0868dbad 100644 --- a/cmd/flux/get_image_all.go +++ b/cmd/flux/get_image_all.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var getImageAllCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_policy.go b/cmd/flux/get_image_policy.go index 9d261fe8..d71b22da 100644 --- a/cmd/flux/get_image_policy.go +++ b/cmd/flux/get_image_policy.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/runtime" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var getImagePolicyCmd = &cobra.Command{ @@ -74,11 +74,16 @@ func init() { func (s imagePolicyListAdapter) summariseItem(i int, includeNamespace bool, includeKind bool) []string { item := s.Items[i] status, msg := statusAndMessage(item.Status.Conditions) - return append(nameColumns(&item, includeNamespace, includeKind), item.Status.LatestImage, status, msg) + var image, tag string + if ref := item.Status.LatestRef; ref != nil { + image = ref.Name + tag = ref.Tag + } + return append(nameColumns(&item, includeNamespace, includeKind), image, tag, status, msg) } func (s imagePolicyListAdapter) headers(includeNamespace bool) []string { - headers := []string{"Name", "Latest image", "Ready", "Message"} + headers := []string{"Name", "Image", "Tag", "Ready", "Message"} if includeNamespace { return append(namespaceHeader, headers...) } diff --git a/cmd/flux/get_image_repository.go b/cmd/flux/get_image_repository.go index a19f5c2c..ac593ade 100644 --- a/cmd/flux/get_image_repository.go +++ b/cmd/flux/get_image_repository.go @@ -26,7 +26,7 @@ import ( "golang.org/x/text/language" "k8s.io/apimachinery/pkg/runtime" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var getImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/image.go b/cmd/flux/image.go index 621dabfc..60643969 100644 --- a/cmd/flux/image.go +++ b/cmd/flux/image.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) // 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 6a386c8b..b03402dd 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var reconcileImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/resume_image_repository.go b/cmd/flux/resume_image_repository.go index a9ab36cd..2e36bbfe 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var resumeImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/stats.go b/cmd/flux/stats.go index 156963a7..d9bc49e2 100644 --- a/cmd/flux/stats.go +++ b/cmd/flux/stats.go @@ -29,7 +29,7 @@ import ( "github.com/fluxcd/cli-utils/pkg/kstatus/status" helmv2 "github.com/fluxcd/helm-controller/api/v2" autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" diff --git a/cmd/flux/suspend_image_repository.go b/cmd/flux/suspend_image_repository.go index c6e562d1..5bd98f6a 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/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" ) var suspendImageRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/testdata/export/image-policy.yaml b/cmd/flux/testdata/export/image-policy.yaml index 317fcba3..8c8a89d3 100644 --- a/cmd/flux/testdata/export/image-policy.yaml +++ b/cmd/flux/testdata/export/image-policy.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta2 +apiVersion: image.toolkit.fluxcd.io/v1 kind: ImagePolicy metadata: name: flux-system diff --git a/cmd/flux/testdata/export/image-repo.yaml b/cmd/flux/testdata/export/image-repo.yaml index 5263245c..f8ae7b2b 100644 --- a/cmd/flux/testdata/export/image-repo.yaml +++ b/cmd/flux/testdata/export/image-repo.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta2 +apiVersion: image.toolkit.fluxcd.io/v1 kind: ImageRepository metadata: name: flux-system diff --git a/cmd/flux/testdata/export/objects.yaml b/cmd/flux/testdata/export/objects.yaml index cd8df996..6fcbf530 100644 --- a/cmd/flux/testdata/export/objects.yaml +++ b/cmd/flux/testdata/export/objects.yaml @@ -30,7 +30,7 @@ spec: - kind: "Kustomization" name: "*" --- -apiVersion: image.toolkit.fluxcd.io/v1beta2 +apiVersion: image.toolkit.fluxcd.io/v1 kind: ImageRepository metadata: name: flux-system @@ -39,7 +39,7 @@ spec: image: ghcr.io/test/podinfo interval: 1m0s --- -apiVersion: image.toolkit.fluxcd.io/v1beta2 +apiVersion: image.toolkit.fluxcd.io/v1 kind: ImagePolicy metadata: name: flux-system diff --git a/cmd/flux/testdata/image/get_image_policy_regex.golden b/cmd/flux/testdata/image/get_image_policy_regex.golden index 94d5dbcf..474a2c0c 100644 --- a/cmd/flux/testdata/image/get_image_policy_regex.golden +++ b/cmd/flux/testdata/image/get_image_policy_regex.golden @@ -1,2 +1,2 @@ -NAME LATEST IMAGE READY MESSAGE -podinfo-regex ghcr.io/stefanprodan/podinfo:5.0.0 True Latest image tag for ghcr.io/stefanprodan/podinfo resolved to 5.0.0 +NAME IMAGE TAG READY MESSAGE +podinfo-regex ghcr.io/stefanprodan/podinfo 5.0.0 True Latest image tag for ghcr.io/stefanprodan/podinfo resolved to 5.0.0 diff --git a/cmd/flux/testdata/image/get_image_policy_semver.golden b/cmd/flux/testdata/image/get_image_policy_semver.golden index c55e404a..e07c3ebc 100644 --- a/cmd/flux/testdata/image/get_image_policy_semver.golden +++ b/cmd/flux/testdata/image/get_image_policy_semver.golden @@ -1,2 +1,2 @@ -NAME LATEST IMAGE READY MESSAGE -podinfo-semver ghcr.io/stefanprodan/podinfo:5.0.3 True Latest image tag for ghcr.io/stefanprodan/podinfo resolved to 5.0.3 with digest sha256:8704da90172710d422af855049175c1a8295731cbe2ad3b9a1c1074feecf8c10 +NAME IMAGE TAG READY MESSAGE +podinfo-semver ghcr.io/stefanprodan/podinfo 5.0.3 True Latest image tag for ghcr.io/stefanprodan/podinfo resolved to 5.0.3 with digest sha256:8704da90172710d422af855049175c1a8295731cbe2ad3b9a1c1074feecf8c10 diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 712bb476..ce0040b9 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -43,7 +43,7 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2" imageautov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - imagereflectv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagereflectv1 "github.com/fluxcd/image-reflector-controller/api/v1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" diff --git a/pkg/uninstall/uninstall.go b/pkg/uninstall/uninstall.go index 2fd459f1..4212d101 100644 --- a/pkg/uninstall/uninstall.go +++ b/pkg/uninstall/uninstall.go @@ -30,7 +30,7 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2" autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" diff --git a/tests/image-automation/auto.yaml b/tests/image-automation/auto.yaml index cd291856..acc58f19 100644 --- a/tests/image-automation/auto.yaml +++ b/tests/image-automation/auto.yaml @@ -1,4 +1,4 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta2 +apiVersion: image.toolkit.fluxcd.io/v1 kind: ImageRepository metadata: name: podinfo @@ -7,7 +7,7 @@ spec: image: ghcr.io/stefanprodan/podinfo interval: 10m --- -apiVersion: image.toolkit.fluxcd.io/v1beta2 +apiVersion: image.toolkit.fluxcd.io/v1 kind: ImagePolicy metadata: name: podinfo diff --git a/tests/integration/image_repo_test.go b/tests/integration/image_repo_test.go index 0abee9c7..6caf847a 100644 --- a/tests/integration/image_repo_test.go +++ b/tests/integration/image_repo_test.go @@ -31,7 +31,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" automationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1" "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" ) diff --git a/tests/integration/suite_test.go b/tests/integration/suite_test.go index 621ca21f..182f2f37 100644 --- a/tests/integration/suite_test.go +++ b/tests/integration/suite_test.go @@ -33,7 +33,7 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2" automationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2" - reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notiv1beta3 "github.com/fluxcd/notification-controller/api/v1beta3" "github.com/fluxcd/pkg/git"