diff --git a/cmd/flux/create_image_update.go b/cmd/flux/create_image_update.go index c1036dfa38..8e4e7366be 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/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" sourcev1 "github.com/fluxcd/source-controller/api/v1" ) diff --git a/cmd/flux/delete_image_update.go b/cmd/flux/delete_image_update.go index 0c59ff892e..5470c3039b 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/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" ) var deleteImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/events.go b/cmd/flux/events.go index 6593d1d2f4..e477404260 100644 --- a/cmd/flux/events.go +++ b/cmd/flux/events.go @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" helmv2 "github.com/fluxcd/helm-controller/api/v2beta2" - autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" diff --git a/cmd/flux/export_image_update.go b/cmd/flux/export_image_update.go index 2bbc1700e1..59aae7d955 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/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" ) var exportImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/get_image_all.go b/cmd/flux/get_image_all.go index 83c1680c0b..bf0fbd529d 100644 --- a/cmd/flux/get_image_all.go +++ b/cmd/flux/get_image_all.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" ) diff --git a/cmd/flux/get_image_update.go b/cmd/flux/get_image_update.go index 6239962611..f653a055a8 100644 --- a/cmd/flux/get_image_update.go +++ b/cmd/flux/get_image_update.go @@ -26,7 +26,7 @@ import ( "golang.org/x/text/language" "k8s.io/apimachinery/pkg/runtime" - autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" ) var getImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/image.go b/cmd/flux/image.go index 38c264a7c3..621dabfc4f 100644 --- a/cmd/flux/image.go +++ b/cmd/flux/image.go @@ -19,7 +19,7 @@ package main import ( "sigs.k8s.io/controller-runtime/pkg/client" - autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" ) diff --git a/cmd/flux/reconcile_image_updateauto.go b/cmd/flux/reconcile_image_updateauto.go index 95bb42df17..95ec6e95a3 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/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" meta "github.com/fluxcd/pkg/apis/meta" ) diff --git a/cmd/flux/resume_image_updateauto.go b/cmd/flux/resume_image_updateauto.go index d50fddf787..1b29cbafd9 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/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" ) var resumeImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/stats.go b/cmd/flux/stats.go index caa24337c6..1d58a73086 100644 --- a/cmd/flux/stats.go +++ b/cmd/flux/stats.go @@ -28,7 +28,7 @@ import ( "github.com/fluxcd/cli-utils/pkg/kstatus/status" helmv2 "github.com/fluxcd/helm-controller/api/v2beta2" - autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" diff --git a/cmd/flux/suspend_image_updateauto.go b/cmd/flux/suspend_image_updateauto.go index 1c8f11ef6c..a10351174e 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/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" ) var suspendImageUpdateCmd = &cobra.Command{ diff --git a/cmd/flux/testdata/export/image-update.yaml b/cmd/flux/testdata/export/image-update.yaml index e2fcb3c1fa..c78757aa58 100644 --- a/cmd/flux/testdata/export/image-update.yaml +++ b/cmd/flux/testdata/export/image-update.yaml @@ -1,5 +1,5 @@ --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: flux-system diff --git a/cmd/flux/testdata/export/objects.yaml b/cmd/flux/testdata/export/objects.yaml index ee5c228cca..40405d0bc6 100644 --- a/cmd/flux/testdata/export/objects.yaml +++ b/cmd/flux/testdata/export/objects.yaml @@ -51,7 +51,7 @@ spec: semver: range: 5.0.x --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: flux-system diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 26d77ef8f2..42bd4fbded 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -42,7 +42,7 @@ import ( "sigs.k8s.io/yaml" helmv2 "github.com/fluxcd/helm-controller/api/v2beta2" - imageautov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + imageautov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" imagereflectv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" diff --git a/pkg/uninstall/uninstall.go b/pkg/uninstall/uninstall.go index 298a857d2c..0082dafc99 100644 --- a/pkg/uninstall/uninstall.go +++ b/pkg/uninstall/uninstall.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" helmv2 "github.com/fluxcd/helm-controller/api/v2beta2" - autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1" + autov1 "github.com/fluxcd/image-automation-controller/api/v1beta2" imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" diff --git a/tests/image-automation/auto.yaml b/tests/image-automation/auto.yaml index 8f71c881be..a0f7bce2f2 100644 --- a/tests/image-automation/auto.yaml +++ b/tests/image-automation/auto.yaml @@ -19,7 +19,7 @@ spec: semver: range: 5.2.x --- -apiVersion: image.toolkit.fluxcd.io/v1beta1 +apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageUpdateAutomation metadata: name: flux-system diff --git a/tests/integration/go.mod b/tests/integration/go.mod index 8cec90ef65..216fd3c758 100644 --- a/tests/integration/go.mod +++ b/tests/integration/go.mod @@ -7,8 +7,8 @@ require ( github.com/Azure/azure-event-hubs-go/v3 v3.6.2 github.com/chainguard-dev/git-urls v1.0.2 github.com/fluxcd/helm-controller/api v0.37.4 - github.com/fluxcd/image-automation-controller/api v0.37.1 - github.com/fluxcd/image-reflector-controller/api v0.31.2 + github.com/fluxcd/image-automation-controller/api v0.38.0 + github.com/fluxcd/image-reflector-controller/api v0.32.0 github.com/fluxcd/kustomize-controller/api v1.2.2 github.com/fluxcd/notification-controller/api v1.2.4 github.com/fluxcd/pkg/apis/event v0.9.0 @@ -16,7 +16,7 @@ require ( github.com/fluxcd/pkg/git v0.19.0 github.com/fluxcd/pkg/git/gogit v0.19.0 github.com/fluxcd/pkg/runtime v0.47.0 - github.com/fluxcd/source-controller/api v1.2.4 + github.com/fluxcd/source-controller/api v1.3.0 github.com/fluxcd/test-infra/tftestenv v0.0.0-20240422120046-76f14d133f7b github.com/go-git/go-git/v5 v5.12.0 github.com/google/go-containerregistry v0.19.1 @@ -28,7 +28,7 @@ require ( k8s.io/api v0.30.0 k8s.io/apimachinery v0.30.0 k8s.io/client-go v0.30.0 - sigs.k8s.io/controller-runtime v0.18.0 + sigs.k8s.io/controller-runtime v0.18.1 ) require ( diff --git a/tests/integration/go.sum b/tests/integration/go.sum index 9883545f28..54a41ae9bc 100644 --- a/tests/integration/go.sum +++ b/tests/integration/go.sum @@ -116,10 +116,10 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg= github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo= github.com/fluxcd/helm-controller/api v0.37.4 h1:rkBMqYXexyf1s5BS8QpxGi691DsCi+yugIFCM5fNKLU= github.com/fluxcd/helm-controller/api v0.37.4/go.mod h1:KFdP5Lbrc4Vv+Jt4xRj6UUo3qiwdBqBPl1xiiAnBe9c= -github.com/fluxcd/image-automation-controller/api v0.37.1 h1:zi1VfPoGuHsNtyTpueKbr4b/c+Ms7HjFocTAmixmYno= -github.com/fluxcd/image-automation-controller/api v0.37.1/go.mod h1:7p0woxB275YzhdctzbxVMck0/hZt45bm0K12A0ABldo= -github.com/fluxcd/image-reflector-controller/api v0.31.2 h1:s16ewwfuLBYuh8hENuVgU8SYsSNxRaA4f+AD60/+les= -github.com/fluxcd/image-reflector-controller/api v0.31.2/go.mod h1:tV7g+KXQL3W8w5+fRJU7ubVGc4QAfx1C7XI5qrQvA3U= +github.com/fluxcd/image-automation-controller/api v0.38.0 h1:+phX67uf0INGDC4sghsPPNUiE8taVp7AcWgJH8LkiUk= +github.com/fluxcd/image-automation-controller/api v0.38.0/go.mod h1:FfWWRxG03514+MUNJ+uN6fXzjwdbqsJqCggukIZ1tx8= +github.com/fluxcd/image-reflector-controller/api v0.32.0 h1:mb/v9JzRHcjLcnGqmgsq0+yCcoOyae/TrOWae9T87PE= +github.com/fluxcd/image-reflector-controller/api v0.32.0/go.mod h1:Ap3/KK8MfQAdmuhakg9CweEa3Xwwmvausbqrgd3HBWY= github.com/fluxcd/kustomize-controller/api v1.2.2 h1:LXRa2181usLsDkAJ86i/CnvCyPwhLcFUw9jBnXxTFJ4= github.com/fluxcd/kustomize-controller/api v1.2.2/go.mod h1:dfAaPQuuoWfExyWaeO7Kj2ZtfKQ4nDcJrt7AeAFlLZs= github.com/fluxcd/notification-controller/api v1.2.4 h1:H/C8XW5boncf8rzJjSe/MCr186Hgvw+arPat9XOaRlw= @@ -144,8 +144,8 @@ github.com/fluxcd/pkg/ssh v0.13.0 h1:lPU1Gst8XIz7AU2dhdqVFaaOWd54/O1LZu62vH4JB/s github.com/fluxcd/pkg/ssh v0.13.0/go.mod h1:J9eyirMd4s++tWG4euRRhmcthKX203GPHpzFpH++TP8= github.com/fluxcd/pkg/version v0.4.0 h1:3F6oeIZ+ug/f7pALIBhcUhfURel37EPPOn7nsGfsnOg= github.com/fluxcd/pkg/version v0.4.0/go.mod h1:izVsSDxac81qWRmpOL9qcxZYx+zAN1ajoP5SidGP6PA= -github.com/fluxcd/source-controller/api v1.2.4 h1:XjKTWhSSeLGsogWnTcLl5sUnyMlC5TKDbbBgP9SyJ5c= -github.com/fluxcd/source-controller/api v1.2.4/go.mod h1:j3QSHpIPBP5sjaGIkVtsgWCx8JcOmcsutRmdJmRMOZg= +github.com/fluxcd/source-controller/api v1.3.0 h1:Z5Lq0aJY87yg0cQDEuwGLKS60GhdErCHtsi546HUt10= +github.com/fluxcd/source-controller/api v1.3.0/go.mod h1:+tfd0vltjcVs/bbnq9AlYR9AAHSVfM/Z4v4TpQmdJf4= github.com/fluxcd/test-infra/tftestenv v0.0.0-20240422120046-76f14d133f7b h1:hWwk8yTQBxZoQbaP9Xwo4B9IjpDJDBiPVbtja1GnzLs= github.com/fluxcd/test-infra/tftestenv v0.0.0-20240422120046-76f14d133f7b/go.mod h1:liFlLEXgambGVdWSJ4JzbIHf1Vjpp1HwUyPazPIVZug= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= @@ -520,8 +520,8 @@ k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 h1:SbdLaI6mM6ffDSJCadEaD4 k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.18.0 h1:Z7jKuX784TQSUL1TIyeuF7j8KXZ4RtSX0YgtjKcSTME= -sigs.k8s.io/controller-runtime v0.18.0/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= +sigs.k8s.io/controller-runtime v0.18.1 h1:RpWbigmuiylbxOCLy0tGnq1cU1qWPwNIQzoJk+QeJx4= +sigs.k8s.io/controller-runtime v0.18.1/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/tests/integration/image_repo_test.go b/tests/integration/image_repo_test.go index 96abb1f39a..0abee9c7d7 100644 --- a/tests/integration/image_repo_test.go +++ b/tests/integration/image_repo_test.go @@ -30,8 +30,8 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - automationv1beta1 "github.com/fluxcd/image-automation-controller/api/v1beta1" - reflectorv1beta2 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + automationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2" + reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" ) @@ -103,12 +103,12 @@ spec: return true }, testTimeout, testInterval).Should(BeTrue()) - imageRepository := reflectorv1beta2.ImageRepository{ + imageRepository := reflectorv1.ImageRepository{ ObjectMeta: metav1.ObjectMeta{ Name: "podinfo", Namespace: testID, }, - Spec: reflectorv1beta2.ImageRepositorySpec{ + Spec: reflectorv1.ImageRepositorySpec{ Image: imageURL, Interval: metav1.Duration{ Duration: 1 * time.Minute, @@ -119,17 +119,17 @@ spec: g.Expect(testEnv.Create(ctx, &imageRepository)).To(Succeed()) defer testEnv.Delete(ctx, &imageRepository) - imagePolicy := reflectorv1beta2.ImagePolicy{ + imagePolicy := reflectorv1.ImagePolicy{ ObjectMeta: metav1.ObjectMeta{ Name: "podinfo", Namespace: testID, }, - Spec: reflectorv1beta2.ImagePolicySpec{ + Spec: reflectorv1.ImagePolicySpec{ ImageRepositoryRef: meta.NamespacedObjectReference{ Name: imageRepository.Name, }, - Policy: reflectorv1beta2.ImagePolicyChoice{ - SemVer: &reflectorv1beta2.SemVerPolicy{ + Policy: reflectorv1.ImagePolicyChoice{ + SemVer: &reflectorv1.SemVerPolicy{ Range: "6.0.x", }, }, @@ -138,35 +138,35 @@ spec: g.Expect(testEnv.Create(ctx, &imagePolicy)).To(Succeed()) defer testEnv.Delete(ctx, &imagePolicy) - imageAutomation := automationv1beta1.ImageUpdateAutomation{ + imageAutomation := automationv1.ImageUpdateAutomation{ ObjectMeta: metav1.ObjectMeta{ Name: "podinfo", Namespace: testID, }, - Spec: automationv1beta1.ImageUpdateAutomationSpec{ + Spec: automationv1.ImageUpdateAutomationSpec{ Interval: metav1.Duration{ Duration: 1 * time.Minute, }, - SourceRef: automationv1beta1.CrossNamespaceSourceReference{ + SourceRef: automationv1.CrossNamespaceSourceReference{ Kind: "GitRepository", Name: testID, }, - GitSpec: &automationv1beta1.GitSpec{ - Checkout: &automationv1beta1.GitCheckoutSpec{ + GitSpec: &automationv1.GitSpec{ + Checkout: &automationv1.GitCheckoutSpec{ Reference: sourcev1.GitRepositoryRef{ Branch: branchName, }, }, - Commit: automationv1beta1.CommitSpec{ - Author: automationv1beta1.CommitUser{ + Commit: automationv1.CommitSpec{ + Author: automationv1.CommitUser{ Email: "imageautomation@example.com", Name: "imageautomation", }, }, }, - Update: &automationv1beta1.UpdateStrategy{ + Update: &automationv1.UpdateStrategy{ Path: testID, - Strategy: automationv1beta1.UpdateStrategySetters, + Strategy: automationv1.UpdateStrategySetters, }, }, } diff --git a/tests/integration/suite_test.go b/tests/integration/suite_test.go index c20526998a..22e02b1a57 100644 --- a/tests/integration/suite_test.go +++ b/tests/integration/suite_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/client-go/kubernetes/scheme" helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta2" - automationv1beta1 "github.com/fluxcd/image-automation-controller/api/v1beta1" - reflectorv1beta2 "github.com/fluxcd/image-reflector-controller/api/v1beta2" + automationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2" + reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notiv1beta3 "github.com/fluxcd/notification-controller/api/v1beta3" "github.com/fluxcd/pkg/git" @@ -165,8 +165,8 @@ func init() { utilruntime.Must(sourcev1beta2.AddToScheme(scheme.Scheme)) utilruntime.Must(kustomizev1.AddToScheme(scheme.Scheme)) utilruntime.Must(helmv2beta1.AddToScheme(scheme.Scheme)) - utilruntime.Must(reflectorv1beta2.AddToScheme(scheme.Scheme)) - utilruntime.Must(automationv1beta1.AddToScheme(scheme.Scheme)) + utilruntime.Must(reflectorv1.AddToScheme(scheme.Scheme)) + utilruntime.Must(automationv1.AddToScheme(scheme.Scheme)) utilruntime.Must(notiv1beta3.AddToScheme(scheme.Scheme)) random = rand.New(rand.NewSource(time.Now().UnixNano()))