diff --git a/hack/installers/install-codegen-go-tools.sh b/hack/installers/install-codegen-go-tools.sh index 9630fd615b..501cb535e3 100755 --- a/hack/installers/install-codegen-go-tools.sh +++ b/hack/installers/install-codegen-go-tools.sh @@ -45,13 +45,13 @@ go_mod_install k8s.io/code-generator/cmd/lister-gen go_mod_install k8s.io/kube-openapi/cmd/openapi-gen # controller-gen is run by ./hack/gen-crd-spec to generate the CRDs -go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 +go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 # swagger cli is used to generate swagger docs go install github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5 # goimports is used to auto-format generated code -go install golang.org/x/tools/cmd/goimports@v0.11.0 +go install golang.org/x/tools/cmd/goimports@v0.20.0 # mockery is used for generating mock -go install github.com/vektra/mockery/v2@v2.32.0 +go install github.com/vektra/mockery/v2@v2.42.2 diff --git a/manifests/crds/analysis-run-crd.yaml b/manifests/crds/analysis-run-crd.yaml index 04539115a5..816702aa04 100644 --- a/manifests/crds/analysis-run-crd.yaml +++ b/manifests/crds/analysis-run-crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: analysisruns.argoproj.io spec: group: argoproj.io diff --git a/manifests/crds/analysis-template-crd.yaml b/manifests/crds/analysis-template-crd.yaml index ffb0da24c3..3bcf3855ad 100644 --- a/manifests/crds/analysis-template-crd.yaml +++ b/manifests/crds/analysis-template-crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: analysistemplates.argoproj.io spec: group: argoproj.io diff --git a/manifests/crds/cluster-analysis-template-crd.yaml b/manifests/crds/cluster-analysis-template-crd.yaml index 444d46fcaa..1f97c14bd8 100644 --- a/manifests/crds/cluster-analysis-template-crd.yaml +++ b/manifests/crds/cluster-analysis-template-crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: clusteranalysistemplates.argoproj.io spec: group: argoproj.io diff --git a/manifests/crds/experiment-crd.yaml b/manifests/crds/experiment-crd.yaml index e4287b51e0..0dae59cb3b 100644 --- a/manifests/crds/experiment-crd.yaml +++ b/manifests/crds/experiment-crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: experiments.argoproj.io spec: group: argoproj.io diff --git a/manifests/crds/rollout-crd.yaml b/manifests/crds/rollout-crd.yaml index cd244b8b98..04e187dbea 100755 --- a/manifests/crds/rollout-crd.yaml +++ b/manifests/crds/rollout-crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: rollouts.argoproj.io spec: group: argoproj.io diff --git a/manifests/install.yaml b/manifests/install.yaml index d2cf54d81c..db630b3511 100755 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: analysisruns.argoproj.io spec: group: argoproj.io @@ -3296,7 +3296,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: analysistemplates.argoproj.io spec: group: argoproj.io @@ -6463,7 +6463,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: clusteranalysistemplates.argoproj.io spec: group: argoproj.io @@ -9630,7 +9630,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: experiments.argoproj.io spec: group: argoproj.io @@ -12489,7 +12489,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: rollouts.argoproj.io spec: group: argoproj.io diff --git a/metricproviders/mocks/Provider.go b/metricproviders/mocks/Provider.go index 1e647a943d..b0fd342ec5 100644 --- a/metricproviders/mocks/Provider.go +++ b/metricproviders/mocks/Provider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.32.0. DO NOT EDIT. +// Code generated by mockery v2.42.2. DO NOT EDIT. package mocks @@ -16,6 +16,10 @@ type Provider struct { func (_m *Provider) GarbageCollect(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metric, _a2 int) error { ret := _m.Called(_a0, _a1, _a2) + if len(ret) == 0 { + panic("no return value specified for GarbageCollect") + } + var r0 error if rf, ok := ret.Get(0).(func(*v1alpha1.AnalysisRun, v1alpha1.Metric, int) error); ok { r0 = rf(_a0, _a1, _a2) @@ -30,6 +34,10 @@ func (_m *Provider) GarbageCollect(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metri func (_m *Provider) GetMetadata(_a0 v1alpha1.Metric) map[string]string { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for GetMetadata") + } + var r0 map[string]string if rf, ok := ret.Get(0).(func(v1alpha1.Metric) map[string]string); ok { r0 = rf(_a0) @@ -46,6 +54,10 @@ func (_m *Provider) GetMetadata(_a0 v1alpha1.Metric) map[string]string { func (_m *Provider) Resume(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metric, _a2 v1alpha1.Measurement) v1alpha1.Measurement { ret := _m.Called(_a0, _a1, _a2) + if len(ret) == 0 { + panic("no return value specified for Resume") + } + var r0 v1alpha1.Measurement if rf, ok := ret.Get(0).(func(*v1alpha1.AnalysisRun, v1alpha1.Metric, v1alpha1.Measurement) v1alpha1.Measurement); ok { r0 = rf(_a0, _a1, _a2) @@ -60,6 +72,10 @@ func (_m *Provider) Resume(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metric, _a2 v func (_m *Provider) Run(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metric) v1alpha1.Measurement { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for Run") + } + var r0 v1alpha1.Measurement if rf, ok := ret.Get(0).(func(*v1alpha1.AnalysisRun, v1alpha1.Metric) v1alpha1.Measurement); ok { r0 = rf(_a0, _a1) @@ -74,6 +90,10 @@ func (_m *Provider) Run(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metric) v1alpha1 func (_m *Provider) Terminate(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metric, _a2 v1alpha1.Measurement) v1alpha1.Measurement { ret := _m.Called(_a0, _a1, _a2) + if len(ret) == 0 { + panic("no return value specified for Terminate") + } + var r0 v1alpha1.Measurement if rf, ok := ret.Get(0).(func(*v1alpha1.AnalysisRun, v1alpha1.Metric, v1alpha1.Measurement) v1alpha1.Measurement); ok { r0 = rf(_a0, _a1, _a2) @@ -88,6 +108,10 @@ func (_m *Provider) Terminate(_a0 *v1alpha1.AnalysisRun, _a1 v1alpha1.Metric, _a func (_m *Provider) Type() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Type") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() diff --git a/rollout/mocks/TrafficRoutingReconciler.go b/rollout/mocks/TrafficRoutingReconciler.go index c8c3a7cde8..ceabc90a3d 100644 --- a/rollout/mocks/TrafficRoutingReconciler.go +++ b/rollout/mocks/TrafficRoutingReconciler.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.32.0. DO NOT EDIT. +// Code generated by mockery v2.42.2. DO NOT EDIT. package mocks @@ -17,6 +17,10 @@ type TrafficRoutingReconciler struct { func (_m *TrafficRoutingReconciler) RemoveManagedRoutes() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for RemoveManagedRoutes") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -31,6 +35,10 @@ func (_m *TrafficRoutingReconciler) RemoveManagedRoutes() error { func (_m *TrafficRoutingReconciler) SetHeaderRoute(setHeaderRoute *v1alpha1.SetHeaderRoute) error { ret := _m.Called(setHeaderRoute) + if len(ret) == 0 { + panic("no return value specified for SetHeaderRoute") + } + var r0 error if rf, ok := ret.Get(0).(func(*v1alpha1.SetHeaderRoute) error); ok { r0 = rf(setHeaderRoute) @@ -45,6 +53,10 @@ func (_m *TrafficRoutingReconciler) SetHeaderRoute(setHeaderRoute *v1alpha1.SetH func (_m *TrafficRoutingReconciler) SetMirrorRoute(setMirrorRoute *v1alpha1.SetMirrorRoute) error { ret := _m.Called(setMirrorRoute) + if len(ret) == 0 { + panic("no return value specified for SetMirrorRoute") + } + var r0 error if rf, ok := ret.Get(0).(func(*v1alpha1.SetMirrorRoute) error); ok { r0 = rf(setMirrorRoute) @@ -66,6 +78,10 @@ func (_m *TrafficRoutingReconciler) SetWeight(desiredWeight int32, additionalDes _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for SetWeight") + } + var r0 error if rf, ok := ret.Get(0).(func(int32, ...v1alpha1.WeightDestination) error); ok { r0 = rf(desiredWeight, additionalDestinations...) @@ -80,6 +96,10 @@ func (_m *TrafficRoutingReconciler) SetWeight(desiredWeight int32, additionalDes func (_m *TrafficRoutingReconciler) Type() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Type") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() @@ -101,6 +121,10 @@ func (_m *TrafficRoutingReconciler) UpdateHash(canaryHash string, stableHash str _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for UpdateHash") + } + var r0 error if rf, ok := ret.Get(0).(func(string, string, ...v1alpha1.WeightDestination) error); ok { r0 = rf(canaryHash, stableHash, additionalDestinations...) @@ -122,6 +146,10 @@ func (_m *TrafficRoutingReconciler) VerifyWeight(desiredWeight int32, additional _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for VerifyWeight") + } + var r0 *bool var r1 error if rf, ok := ret.Get(0).(func(int32, ...v1alpha1.WeightDestination) (*bool, error)); ok { diff --git a/utils/aws/mocks/ELBv2APIClient.go b/utils/aws/mocks/ELBv2APIClient.go index 5e9f9dc380..f004df4702 100644 --- a/utils/aws/mocks/ELBv2APIClient.go +++ b/utils/aws/mocks/ELBv2APIClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.32.0. DO NOT EDIT. +// Code generated by mockery v2.42.2. DO NOT EDIT. package mocks @@ -25,6 +25,10 @@ func (_m *ELBv2APIClient) DescribeListeners(_a0 context.Context, _a1 *elasticloa _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DescribeListeners") + } + var r0 *elasticloadbalancingv2.DescribeListenersOutput var r1 error if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeListenersInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeListenersOutput, error)); ok { @@ -58,6 +62,10 @@ func (_m *ELBv2APIClient) DescribeLoadBalancers(_a0 context.Context, _a1 *elasti _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DescribeLoadBalancers") + } + var r0 *elasticloadbalancingv2.DescribeLoadBalancersOutput var r1 error if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeLoadBalancersInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeLoadBalancersOutput, error)); ok { @@ -91,6 +99,10 @@ func (_m *ELBv2APIClient) DescribeRules(ctx context.Context, params *elasticload _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DescribeRules") + } + var r0 *elasticloadbalancingv2.DescribeRulesOutput var r1 error if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeRulesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeRulesOutput, error)); ok { @@ -124,6 +136,10 @@ func (_m *ELBv2APIClient) DescribeTags(ctx context.Context, params *elasticloadb _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DescribeTags") + } + var r0 *elasticloadbalancingv2.DescribeTagsOutput var r1 error if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTagsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeTagsOutput, error)); ok { @@ -157,6 +173,10 @@ func (_m *ELBv2APIClient) DescribeTargetGroups(_a0 context.Context, _a1 *elastic _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DescribeTargetGroups") + } + var r0 *elasticloadbalancingv2.DescribeTargetGroupsOutput var r1 error if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetGroupsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeTargetGroupsOutput, error)); ok { @@ -190,6 +210,10 @@ func (_m *ELBv2APIClient) DescribeTargetHealth(ctx context.Context, params *elas _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DescribeTargetHealth") + } + var r0 *elasticloadbalancingv2.DescribeTargetHealthOutput var r1 error if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetHealthInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeTargetHealthOutput, error)); ok {