Skip to content

Commit 437a943

Browse files
stefanprodanstefanprodan
committed
Update HelmRelease to v2beta2
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
1 parent bed6efa commit 437a943

25 files changed

+73
-70
lines changed

‎cmd/flux/create_helmrelease.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ import (
2424
"strings"
2525
"time"
2626

27-
"github.com/fluxcd/flux2/v2/internal/flags"
28-
"github.com/fluxcd/flux2/v2/internal/utils"
2927
"github.com/fluxcd/pkg/apis/meta"
3028
"github.com/fluxcd/pkg/runtime/transform"
3129

30+
"github.com/fluxcd/flux2/v2/internal/flags"
31+
"github.com/fluxcd/flux2/v2/internal/utils"
32+
3233
"github.com/spf13/cobra"
3334
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3435
"k8s.io/apimachinery/pkg/api/errors"
@@ -38,7 +39,7 @@ import (
3839
"sigs.k8s.io/controller-runtime/pkg/client"
3940
"sigs.k8s.io/yaml"
4041

41-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
42+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
4243
)
4344

4445
var createHelmReleaseCmd = &cobra.Command{

‎cmd/flux/create_kustomization.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/util/wait"
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131

32-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
32+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
3333
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
3434
"github.com/fluxcd/pkg/apis/meta"
3535

‎cmd/flux/delete_helmrelease.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
22+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2323
)
2424

2525
var deleteHelmReleaseCmd = &cobra.Command{

‎cmd/flux/events.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
cmdutil "k8s.io/kubectl/pkg/cmd/util"
4040
"sigs.k8s.io/controller-runtime/pkg/client"
4141

42-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
42+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
4343
autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
4444
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
4545
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"

‎cmd/flux/export_helmrelease.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/spf13/cobra"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

23-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
23+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2424
)
2525

2626
var exportHelmReleaseCmd = &cobra.Command{

‎cmd/flux/get_all.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
24+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2525
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
2626
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
2727
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"

‎cmd/flux/get_helmrelease.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"golang.org/x/text/language"
2626
"k8s.io/apimachinery/pkg/runtime"
2727

28-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
28+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2929
)
3030

3131
var getHelmReleaseCmd = &cobra.Command{

‎cmd/flux/helmrelease.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"sigs.k8s.io/controller-runtime/pkg/client"
2121

22-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
22+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2323
)
2424

2525
// helmv2.HelmRelease

‎cmd/flux/reconcile.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"k8s.io/client-go/util/retry"
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333

34-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
34+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
3535
"github.com/fluxcd/pkg/apis/meta"
3636

3737
"github.com/fluxcd/flux2/v2/internal/utils"
@@ -179,10 +179,10 @@ func requestReconciliation(ctx context.Context, kubeClient client.Client,
179179
// HelmRelease specific annotations to force or reset a release.
180180
if gvk.Kind == helmv2.HelmReleaseKind {
181181
if rhrArgs.syncForce {
182-
annotations["reconcile.fluxcd.io/forceAt"] = ts
182+
annotations[helmv2.ForceRequestAnnotation] = ts
183183
}
184184
if rhrArgs.syncReset {
185-
annotations["reconcile.fluxcd.io/resetAt"] = ts
185+
annotations[helmv2.ResetRequestAnnotation] = ts
186186
}
187187
}
188188

‎cmd/flux/reconcile_helmrelease.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/spf13/cobra"
2323
"k8s.io/apimachinery/pkg/types"
2424

25-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
25+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2626
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
2727
)
2828

‎cmd/flux/resume_helmrelease.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
24+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2525
)
2626

2727
var resumeHrCmd = &cobra.Command{

‎cmd/flux/stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828

2929
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
30-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
30+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
3131
autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
3232
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
3333
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"

‎cmd/flux/suspend_helmrelease.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
22+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2323
)
2424

2525
var suspendHrCmd = &cobra.Command{

‎cmd/flux/trace.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ import (
3333
"k8s.io/cli-runtime/pkg/resource"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535

36-
"github.com/fluxcd/flux2/v2/internal/utils"
37-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
36+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
3837
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
3938
fluxmeta "github.com/fluxcd/pkg/apis/meta"
4039
"github.com/fluxcd/pkg/oci"
4140
sourcev1 "github.com/fluxcd/source-controller/api/v1"
4241
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
42+
43+
"github.com/fluxcd/flux2/v2/internal/utils"
4344
)
4445

4546
var traceCmd = &cobra.Command{

‎cmd/flux/tree_kustomization.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"sigs.k8s.io/yaml"
3636

3737
"github.com/fluxcd/cli-utils/pkg/object"
38-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
38+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
3939
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
4040
"github.com/fluxcd/pkg/ssa"
4141

‎internal/flags/crds.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"strings"
2222

23-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
23+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
2424

2525
"github.com/fluxcd/flux2/v2/internal/utils"
2626
)

‎internal/utils/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"sigs.k8s.io/controller-runtime/pkg/client"
4242
"sigs.k8s.io/yaml"
4343

44-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
44+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
4545
imageautov1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
4646
imagereflectv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
4747
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"

‎pkg/uninstall/uninstall.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@ import (
2828
"k8s.io/apimachinery/pkg/util/errors"
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030

31-
"github.com/fluxcd/flux2/v2/pkg/log"
32-
"github.com/fluxcd/flux2/v2/pkg/manifestgen"
33-
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
31+
helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
3432
autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
3533
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
3634
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
3735
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
3836
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
3937
sourcev1 "github.com/fluxcd/source-controller/api/v1"
4038
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
39+
40+
"github.com/fluxcd/flux2/v2/pkg/log"
41+
"github.com/fluxcd/flux2/v2/pkg/manifestgen"
4142
)
4243

4344
// Components removes all Kubernetes components that are part of Flux excluding the CRDs and namespace.

‎tests/azure/go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
88
require (
99
github.com/Azure/azure-event-hubs-go/v3 v3.6.1
1010
github.com/chainguard-dev/git-urls v1.0.2
11-
github.com/fluxcd/helm-controller/api v0.36.2
12-
github.com/fluxcd/image-automation-controller/api v0.36.1
13-
github.com/fluxcd/image-reflector-controller/api v0.31.0
14-
github.com/fluxcd/kustomize-controller/api v1.1.1
15-
github.com/fluxcd/notification-controller/api v1.2.1
11+
github.com/fluxcd/helm-controller/api v0.37.0
12+
github.com/fluxcd/image-automation-controller/api v0.37.0
13+
github.com/fluxcd/image-reflector-controller/api v0.31.1
14+
github.com/fluxcd/kustomize-controller/api v1.2.0
15+
github.com/fluxcd/notification-controller/api v1.2.2
1616
github.com/fluxcd/pkg/apis/event v0.6.0
1717
github.com/fluxcd/pkg/apis/meta v1.2.0
1818
github.com/fluxcd/pkg/git v0.16.0
1919
github.com/fluxcd/pkg/git/gogit v0.16.1
20-
github.com/fluxcd/source-controller/api v1.2.1
20+
github.com/fluxcd/source-controller/api v1.2.2
2121
github.com/go-git/go-git/v5 v5.11.0
2222
github.com/hashicorp/hc-install v0.5.2
2323
github.com/hashicorp/terraform-exec v0.18.1
@@ -56,7 +56,7 @@ require (
5656
github.com/emirpasic/gods v1.18.1 // indirect
5757
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
5858
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
59-
github.com/fluxcd/pkg/apis/kustomize v1.1.1 // indirect
59+
github.com/fluxcd/pkg/apis/kustomize v1.2.0 // indirect
6060
github.com/fluxcd/pkg/ssh v0.10.0 // indirect
6161
github.com/fluxcd/pkg/version v0.2.2 // indirect
6262
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -115,7 +115,7 @@ require (
115115
gopkg.in/yaml.v3 v3.0.1 // indirect
116116
k8s.io/apiextensions-apiserver v0.28.4 // indirect
117117
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
118-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
118+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
119119
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
120120
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
121121
sigs.k8s.io/yaml v1.4.0 // indirect

‎tests/azure/go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,22 @@ github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FM
6767
github.com/evanphx/json-patch/v5 v5.7.0 h1:nJqP7uwL84RJInrohHfW0Fx3awjbm8qZeFv0nW9SYGc=
6868
github.com/evanphx/json-patch/v5 v5.7.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
6969
github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
70-
github.com/fluxcd/helm-controller/api v0.36.2 h1:9JaTc91yocG1oQkM/GMfpZ/nGPpliRjZBNwyAsW5584=
71-
github.com/fluxcd/helm-controller/api v0.36.2/go.mod h1:zkcRy3PxG0NoxSY5SjiSA5tWOGa6spIbWsChQY8FXqM=
72-
github.com/fluxcd/image-automation-controller/api v0.36.1 h1:Knd4SSm/bJ0iqvYcQq87uDaT/mW9poM1jOvHpJ/4tzk=
73-
github.com/fluxcd/image-automation-controller/api v0.36.1/go.mod h1:IsjdBtgm71KHRGDTZZZiGYdWGoJ5VjenE9F4ueADM/o=
74-
github.com/fluxcd/image-reflector-controller/api v0.31.0 h1:9t5zj7ufo9/d57gpcZsD6YAIxFz0vtLH4jXCj379srE=
75-
github.com/fluxcd/image-reflector-controller/api v0.31.0/go.mod h1:/EcjOa/EYi8sSBHcGrBkLjMjNNfC7xXMxqG9phBORCo=
76-
github.com/fluxcd/kustomize-controller/api v1.1.1 h1:pQcAzvBC3cFGOCgk0zrcsO1Kjtal1tvd6rHXkyp2R78=
77-
github.com/fluxcd/kustomize-controller/api v1.1.1/go.mod h1:FHJTX6c0+CznUNGMol5+Uc4lQsYRxWgpmIRK/xDCghA=
78-
github.com/fluxcd/notification-controller/api v1.2.1 h1:yPQZ7ppYvazxl/Vsespbx9VlVyopH7p8pKGzZTNxI0c=
79-
github.com/fluxcd/notification-controller/api v1.2.1/go.mod h1:1sWTpAXkga5zkXOgFoR+NIJgHNclBcfAHUJ/rMAjnYY=
70+
github.com/fluxcd/helm-controller/api v0.37.0 h1:B14z4nJXmLhtEwQn681bIDy3V1o7USI3X22BuIIsrOw=
71+
github.com/fluxcd/helm-controller/api v0.37.0/go.mod h1:BuXZhAX9blQviil6yUN5zNM4RB753yhyBTJXxXff7Mo=
72+
github.com/fluxcd/image-automation-controller/api v0.37.0 h1:0L8kzX3zaYfg4wQ2Mx3G56atLMNeDGjy5qMGP4tDKRs=
73+
github.com/fluxcd/image-automation-controller/api v0.37.0/go.mod h1:B2EbmiY69mE2bGOENPNUXr6klwrVe7FwVoB2iE1q08E=
74+
github.com/fluxcd/image-reflector-controller/api v0.31.1 h1:nc44G0JjLgSvqglJSiXQJZcrRw+eY01j7fHRUDB3FMw=
75+
github.com/fluxcd/image-reflector-controller/api v0.31.1/go.mod h1:KopMbC92Cw2ypZZeMytzTLr3EfOj2hoL6MizrdpBDhc=
76+
github.com/fluxcd/kustomize-controller/api v1.2.0 h1:kXlZUl5QztIIrqceZLBYF+f3am41B47uXgVw8WlnuMY=
77+
github.com/fluxcd/kustomize-controller/api v1.2.0/go.mod h1:0Kgc4uYnr5jCm4H8JwArkR0v4WTmXeX/9KgoDbxluVc=
78+
github.com/fluxcd/notification-controller/api v1.2.2 h1:BUuVkYxrXzpsdCGh76Tiu//6dffLFo10KmX7MaVeZ64=
79+
github.com/fluxcd/notification-controller/api v1.2.2/go.mod h1:A0VkH3mswQAeGKsmzq81jAUN+zNJt9SPXjwe8mvnnaw=
8080
github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
8181
github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
8282
github.com/fluxcd/pkg/apis/event v0.6.0 h1:AUaeee1CGWb65BLqVximHXG8Gcu6vWuYONIq6tVpjgo=
8383
github.com/fluxcd/pkg/apis/event v0.6.0/go.mod h1:OEzWcX/oPbMmkCvC9QGoK27JXFvUZgBhLD+zgxZe47A=
84-
github.com/fluxcd/pkg/apis/kustomize v1.1.1 h1:MSGn4z0R9PptmoPFHnx2nEZ8Jtl1sKfw0cuDQY2HYwM=
85-
github.com/fluxcd/pkg/apis/kustomize v1.1.1/go.mod h1:0pCu0ecIY+ZM0iE/hOHYwCMZ3b0SpBrjJ1SH3FFyYdE=
84+
github.com/fluxcd/pkg/apis/kustomize v1.2.0 h1:vkVs+OumxaWso0jNCqdgFFfMHdh+qtZhykTkjl7OgmA=
85+
github.com/fluxcd/pkg/apis/kustomize v1.2.0/go.mod h1:VF7tR/WuVFeum+HaMTHwp+eCtsHiiQlY6ihgqtAnW/M=
8686
github.com/fluxcd/pkg/apis/meta v1.2.0 h1:O766PzGAdMdQKybSflGL8oV0+GgCNIkdsxfalRyzeO8=
8787
github.com/fluxcd/pkg/apis/meta v1.2.0/go.mod h1:fU/Az9AoVyIxC0oI4ihG0NVMNnvrcCzdEym3wxjIQsc=
8888
github.com/fluxcd/pkg/git v0.16.0 h1:xgfMpgsVaxGLechKNaSUif9jnt2Ji/HkwIwxXeDoADk=
@@ -94,8 +94,8 @@ github.com/fluxcd/pkg/ssh v0.10.0 h1:JFz0u/CPEf3hXvmrEvUvXsc70eKh8xphqjXxZuSby9g
9494
github.com/fluxcd/pkg/ssh v0.10.0/go.mod h1:1lFTj3MhU9xQuaJ5PJJoh/FyRYzK54ll9NY/s2KqOZM=
9595
github.com/fluxcd/pkg/version v0.2.2 h1:ZpVXECeLA5hIQMft11iLp6gN3cKcz6UNuVTQPw/bRdI=
9696
github.com/fluxcd/pkg/version v0.2.2/go.mod h1:NGnh/no8S6PyfCDxRFrPY3T5BUnqP48MxfxNRU0z8C0=
97-
github.com/fluxcd/source-controller/api v1.2.1 h1:zWRfwMB/BkV0A/duZQwHEcrE/abWJQt7DUgYTzn4IzM=
98-
github.com/fluxcd/source-controller/api v1.2.1/go.mod h1:n+PMCJXl/AYCjWHn5N/MUuoIFKfDg4kCDviFIa7fDvI=
97+
github.com/fluxcd/source-controller/api v1.2.2 h1:OUivb1UHDmY8+hlxjRx3k8i1w3jMSytdOYRMfmeeZhY=
98+
github.com/fluxcd/source-controller/api v1.2.2/go.mod h1:5gaIVVH7hgb8p3HKFp8P6hGmZEC8fKSt4EcrG3g5vZI=
9999
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
100100
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
101101
github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
@@ -376,8 +376,8 @@ k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
376376
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
377377
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e h1:snPmy96t93RredGRjKfMFt+gvxuVAncqSAyBveJtr4Q=
378378
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
379-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
380-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
379+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
380+
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
381381
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
382382
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
383383
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎tests/azure/util_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/client"
3636
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3737

38-
helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
38+
helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta2"
3939
automationv1beta1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
4040
reflectorv1beta2 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
4141
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"

‎tests/integration/go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ require (
66
cloud.google.com/go/pubsub v1.31.0
77
github.com/Azure/azure-event-hubs-go/v3 v3.6.0
88
github.com/chainguard-dev/git-urls v1.0.2
9-
github.com/fluxcd/helm-controller/api v0.36.2
10-
github.com/fluxcd/image-automation-controller/api v0.36.1
11-
github.com/fluxcd/image-reflector-controller/api v0.31.0
12-
github.com/fluxcd/kustomize-controller/api v1.1.1
13-
github.com/fluxcd/notification-controller/api v1.2.1
9+
github.com/fluxcd/helm-controller/api v0.37.0
10+
github.com/fluxcd/image-automation-controller/api v0.37.0
11+
github.com/fluxcd/image-reflector-controller/api v0.31.1
12+
github.com/fluxcd/kustomize-controller/api v1.2.0
13+
github.com/fluxcd/notification-controller/api v1.2.2
1414
github.com/fluxcd/pkg/apis/event v0.6.0
1515
github.com/fluxcd/pkg/apis/meta v1.2.0
1616
github.com/fluxcd/pkg/git v0.16.0
@@ -64,7 +64,7 @@ require (
6464
github.com/emirpasic/gods v1.18.1 // indirect
6565
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
6666
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
67-
github.com/fluxcd/pkg/apis/kustomize v1.1.1 // indirect
67+
github.com/fluxcd/pkg/apis/kustomize v1.2.0 // indirect
6868
github.com/fluxcd/pkg/ssh v0.10.0 // indirect
6969
github.com/fluxcd/pkg/version v0.2.2 // indirect
7070
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect

‎tests/integration/go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,22 @@ github.com/evanphx/json-patch/v5 v5.7.0 h1:nJqP7uwL84RJInrohHfW0Fx3awjbm8qZeFv0n
122122
github.com/evanphx/json-patch/v5 v5.7.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
123123
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
124124
github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
125-
github.com/fluxcd/helm-controller/api v0.36.2 h1:9JaTc91yocG1oQkM/GMfpZ/nGPpliRjZBNwyAsW5584=
126-
github.com/fluxcd/helm-controller/api v0.36.2/go.mod h1:zkcRy3PxG0NoxSY5SjiSA5tWOGa6spIbWsChQY8FXqM=
127-
github.com/fluxcd/image-automation-controller/api v0.36.1 h1:Knd4SSm/bJ0iqvYcQq87uDaT/mW9poM1jOvHpJ/4tzk=
128-
github.com/fluxcd/image-automation-controller/api v0.36.1/go.mod h1:IsjdBtgm71KHRGDTZZZiGYdWGoJ5VjenE9F4ueADM/o=
129-
github.com/fluxcd/image-reflector-controller/api v0.31.0 h1:9t5zj7ufo9/d57gpcZsD6YAIxFz0vtLH4jXCj379srE=
130-
github.com/fluxcd/image-reflector-controller/api v0.31.0/go.mod h1:/EcjOa/EYi8sSBHcGrBkLjMjNNfC7xXMxqG9phBORCo=
131-
github.com/fluxcd/kustomize-controller/api v1.1.1 h1:pQcAzvBC3cFGOCgk0zrcsO1Kjtal1tvd6rHXkyp2R78=
132-
github.com/fluxcd/kustomize-controller/api v1.1.1/go.mod h1:FHJTX6c0+CznUNGMol5+Uc4lQsYRxWgpmIRK/xDCghA=
133-
github.com/fluxcd/notification-controller/api v1.2.1 h1:yPQZ7ppYvazxl/Vsespbx9VlVyopH7p8pKGzZTNxI0c=
134-
github.com/fluxcd/notification-controller/api v1.2.1/go.mod h1:1sWTpAXkga5zkXOgFoR+NIJgHNclBcfAHUJ/rMAjnYY=
125+
github.com/fluxcd/helm-controller/api v0.37.0 h1:B14z4nJXmLhtEwQn681bIDy3V1o7USI3X22BuIIsrOw=
126+
github.com/fluxcd/helm-controller/api v0.37.0/go.mod h1:BuXZhAX9blQviil6yUN5zNM4RB753yhyBTJXxXff7Mo=
127+
github.com/fluxcd/image-automation-controller/api v0.37.0 h1:0L8kzX3zaYfg4wQ2Mx3G56atLMNeDGjy5qMGP4tDKRs=
128+
github.com/fluxcd/image-automation-controller/api v0.37.0/go.mod h1:B2EbmiY69mE2bGOENPNUXr6klwrVe7FwVoB2iE1q08E=
129+
github.com/fluxcd/image-reflector-controller/api v0.31.1 h1:nc44G0JjLgSvqglJSiXQJZcrRw+eY01j7fHRUDB3FMw=
130+
github.com/fluxcd/image-reflector-controller/api v0.31.1/go.mod h1:KopMbC92Cw2ypZZeMytzTLr3EfOj2hoL6MizrdpBDhc=
131+
github.com/fluxcd/kustomize-controller/api v1.2.0 h1:kXlZUl5QztIIrqceZLBYF+f3am41B47uXgVw8WlnuMY=
132+
github.com/fluxcd/kustomize-controller/api v1.2.0/go.mod h1:0Kgc4uYnr5jCm4H8JwArkR0v4WTmXeX/9KgoDbxluVc=
133+
github.com/fluxcd/notification-controller/api v1.2.2 h1:BUuVkYxrXzpsdCGh76Tiu//6dffLFo10KmX7MaVeZ64=
134+
github.com/fluxcd/notification-controller/api v1.2.2/go.mod h1:A0VkH3mswQAeGKsmzq81jAUN+zNJt9SPXjwe8mvnnaw=
135135
github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
136136
github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
137137
github.com/fluxcd/pkg/apis/event v0.6.0 h1:AUaeee1CGWb65BLqVximHXG8Gcu6vWuYONIq6tVpjgo=
138138
github.com/fluxcd/pkg/apis/event v0.6.0/go.mod h1:OEzWcX/oPbMmkCvC9QGoK27JXFvUZgBhLD+zgxZe47A=
139-
github.com/fluxcd/pkg/apis/kustomize v1.1.1 h1:MSGn4z0R9PptmoPFHnx2nEZ8Jtl1sKfw0cuDQY2HYwM=
140-
github.com/fluxcd/pkg/apis/kustomize v1.1.1/go.mod h1:0pCu0ecIY+ZM0iE/hOHYwCMZ3b0SpBrjJ1SH3FFyYdE=
139+
github.com/fluxcd/pkg/apis/kustomize v1.2.0 h1:vkVs+OumxaWso0jNCqdgFFfMHdh+qtZhykTkjl7OgmA=
140+
github.com/fluxcd/pkg/apis/kustomize v1.2.0/go.mod h1:VF7tR/WuVFeum+HaMTHwp+eCtsHiiQlY6ihgqtAnW/M=
141141
github.com/fluxcd/pkg/apis/meta v1.2.0 h1:O766PzGAdMdQKybSflGL8oV0+GgCNIkdsxfalRyzeO8=
142142
github.com/fluxcd/pkg/apis/meta v1.2.0/go.mod h1:fU/Az9AoVyIxC0oI4ihG0NVMNnvrcCzdEym3wxjIQsc=
143143
github.com/fluxcd/pkg/git v0.16.0 h1:xgfMpgsVaxGLechKNaSUif9jnt2Ji/HkwIwxXeDoADk=

0 commit comments

Comments
 (0)