Update image-reflector API to v1beta2

Signed-off-by: Sunny <[email protected]>

config/crd/bases/image.toolkit.fluxcd.io_imageupdateautomations.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.8.0
+ controller-gen.kubebuilder.io/version: v0.11.1
  creationTimestamp: null
  name: imageupdateautomations.image.toolkit.fluxcd.io
 spec:
@@ -298,9 +298,3 @@ spec:
  storage: true
  subresources:
  status: {}
-status:
- acceptedNames:
- kind: ""
- plural: ""
- conditions: []
- storedVersions: []

controllers/controllers_fuzzer_test.go

@@ -51,7 +51,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/envtest"
  "sigs.k8s.io/controller-runtime/pkg/manager"
 
- image_reflectv1 "github.com/fluxcd/image-reflector-controller/api/v1beta1"
+ image_reflectv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
  "github.com/fluxcd/pkg/gittestserver"
  "github.com/fluxcd/pkg/runtime/controller"
  "github.com/fluxcd/pkg/runtime/testenv"

controllers/imageupdateautomation_controller.go

@@ -47,7 +47,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/reconcile"
  "sigs.k8s.io/controller-runtime/pkg/source"
 
- imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta1"
+ imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta2"
  apiacl "github.com/fluxcd/pkg/apis/acl"
  eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
  "github.com/fluxcd/pkg/apis/meta"

controllers/suite_test.go

@@ -28,7 +28,7 @@ import (
  "k8s.io/client-go/kubernetes/scheme"
  ctrl "sigs.k8s.io/controller-runtime"
 
- imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta1"
+ imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta2"
  "github.com/fluxcd/pkg/runtime/controller"
  "github.com/fluxcd/pkg/runtime/testenv"
  sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"

controllers/update_test.go

@@ -52,7 +52,7 @@ import (
  "github.com/fluxcd/go-git/v5/plumbing/cache"
  "github.com/fluxcd/go-git/v5/plumbing/object"
  "github.com/fluxcd/go-git/v5/storage/filesystem"
- imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta1"
+ imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta2"
  "github.com/fluxcd/pkg/apis/acl"
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/git/gogit"

go.mod

@@ -11,7 +11,7 @@ require (
  github.com/cyphar/filepath-securejoin v0.2.3
  github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
  github.com/fluxcd/image-automation-controller/api v0.29.0
- github.com/fluxcd/image-reflector-controller/api v0.24.0
+ github.com/fluxcd/image-reflector-controller/api v0.25.0
  github.com/fluxcd/pkg/apis/acl v0.1.0
  github.com/fluxcd/pkg/apis/event v0.3.0
  github.com/fluxcd/pkg/apis/meta v0.19.0
@@ -32,7 +32,7 @@ require (
  k8s.io/apimachinery v0.26.1
  k8s.io/client-go v0.26.1
  k8s.io/kube-openapi v0.0.0-20230131224050-76d406abb92a
- sigs.k8s.io/controller-runtime v0.14.2
+ sigs.k8s.io/controller-runtime v0.14.4
  sigs.k8s.io/kustomize/kyaml v0.13.9
 )
 

go.sum

@@ -125,8 +125,8 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
 github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
 github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4 h1:Gm5sGGk+/Wq6RhX4xpCZ2IqjDp5XkjlhENaAuAlpdKc=
 github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
-github.com/fluxcd/image-reflector-controller/api v0.24.0 h1:F0X+IaRSPAWeV5ZDzeqw7hKbq74AmxLSU/SwdXCcc3c=
-github.com/fluxcd/image-reflector-controller/api v0.24.0/go.mod h1:F4l0tBvVk2XAKoRt4xzZmj+XmuaD6fc44n8waAEZMjE=
+github.com/fluxcd/image-reflector-controller/api v0.25.0 h1:tK0Hc7Xxr5z6wtBvLTX/cEwjt9YZdidwQ6JQRZuni3w=
+github.com/fluxcd/image-reflector-controller/api v0.25.0/go.mod h1:VXMXfQ5nLZtP+VKuqxYlQOyJ5aFjvC8YpFp1fSwcEAQ=
 github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
 github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
 github.com/fluxcd/pkg/apis/event v0.3.0 h1:B+IXmfSniUGfoczheNAH0YULgS+ejxMl58RyWlvLa1c=
@@ -867,8 +867,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/cli-utils v0.34.0 h1:zCUitt54f0/MYj/ajVFnG6XSXMhpZ72O/3RewIchW8w=
 sigs.k8s.io/cli-utils v0.34.0/go.mod h1:EXyMwPMu9OL+LRnj0JEMsGG/fRvbgFadcVlSnE8RhFs=
-sigs.k8s.io/controller-runtime v0.14.2 h1:P6IwDhbsRWsBClt/8/h8Zy36bCuGuW5Op7MHpFrN/60=
-sigs.k8s.io/controller-runtime v0.14.2/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
+sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M=
+sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
 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/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=

main.go

@@ -29,7 +29,7 @@ import (
  ctrl "sigs.k8s.io/controller-runtime"
  ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
- imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta1"
+ imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta2"
  "github.com/fluxcd/pkg/runtime/acl"
  "github.com/fluxcd/pkg/runtime/client"
  helper "github.com/fluxcd/pkg/runtime/controller"

pkg/update/setters.go

@@ -32,7 +32,7 @@ import (
  "sigs.k8s.io/kustomize/kyaml/setters2"
  "sigs.k8s.io/kustomize/kyaml/yaml"
 
- imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta1"
+ imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta2"
 )
 
 const (

pkg/update/update_test.go

@@ -29,7 +29,7 @@ import (
  "sigs.k8s.io/kustomize/kyaml/yaml"
 
  "github.com/fluxcd/image-automation-controller/pkg/test"
- imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta1"
+ imagev1_reflect "github.com/fluxcd/image-reflector-controller/api/v1beta2"
 )
 
 func TestUpdateWithSetters(t *testing.T) {