Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump controller-runtime version to v0.14.4 #818

Closed
wants to merge 1 commit into from
Closed

Bump controller-runtime version to v0.14.4 #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 46 additions & 8 deletions controllers/mocks/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions controllers/package_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

api "github.com/aws/eks-anywhere-packages/api/v1alpha1"
ctrlmocks "github.com/aws/eks-anywhere-packages/controllers/mocks"
Expand Down Expand Up @@ -226,7 +227,6 @@ func TestReconcile(t *testing.T) {
assert.EqualError(t, err, "status update test error")
expected := time.Duration(0)
assert.Equal(t, expected, got.RequeueAfter)

})

t.Run("Packages without version hold upgrade to latest", func(t *testing.T) {
Expand Down Expand Up @@ -273,7 +273,6 @@ func TestReconcile(t *testing.T) {
assert.NoError(t, err)
expected = time.Duration(0)
assert.Equal(t, expected, got.RequeueAfter)

})
}

Expand Down Expand Up @@ -382,12 +381,14 @@ func (tf *testFixtures) newReconciler() *PackageReconciler {
}
}

type getFnPkg func(context.Context, types.NamespacedName, *api.Package) error
type getFnPkg func(context.Context, types.NamespacedName, *api.Package, ...client.GetOption) error

func (tf *testFixtures) mockGetFnPkg() (getFnPkg, *api.Package) {
pkg := tf.mockPackage()
return func(ctx context.Context, name types.NamespacedName,
target *api.Package) error {
target *api.Package,
_ ...client.GetOption,
) error {
pkg.DeepCopyInto(target)
return nil
}, pkg
Expand Down
8 changes: 4 additions & 4 deletions controllers/packagebundle_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ func GivenBundle() *api.PackageBundle {
}
}

func doAndReturnBundle(src *api.PackageBundle) func(ctx context.Context, name types.NamespacedName, pb *api.PackageBundle) error {
return func(ctx context.Context, name types.NamespacedName, target *api.PackageBundle) error {
func doAndReturnBundle(src *api.PackageBundle) func(ctx context.Context, name types.NamespacedName, pb *api.PackageBundle, _ ...client.GetOption) error {
return func(ctx context.Context, name types.NamespacedName, target *api.PackageBundle, _ ...client.GetOption) error {
src.DeepCopyInto(target)
return nil
}
Expand Down Expand Up @@ -131,7 +131,8 @@ func TestPackageBundleReconciler_mapBundleReconcileRequests(t *testing.T) {
mockClient.EXPECT().
List(ctx, gomock.Any(), gomock.Any()).
DoAndReturn(func(ctx context.Context, bundles *api.PackageBundleList,
_ ...*client.ListOptions) error {
_ ...*client.ListOptions,
) error {
bundles.Items = []api.PackageBundle{*bundleOne, *bundleTwo}
return nil
})
Expand All @@ -141,5 +142,4 @@ func TestPackageBundleReconciler_mapBundleReconcileRequests(t *testing.T) {
requests := sut.mapBundleReconcileRequests(&api.PackageBundleController{})

assert.Equal(t, 2, len(requests))

}
2 changes: 1 addition & 1 deletion controllers/packagebundlecontroller_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (r *PackageBundleControllerReconciler) Reconcile(ctx context.Context, req c
if pbc.Status.State != api.BundleControllerStateIgnored {
pbc.Status.State = api.BundleControllerStateIgnored
r.Log.V(6).Info("update", "PackageBundleController", pbc.Name, "state", pbc.Status.State)
err = r.Client.Status().Update(ctx, pbc, &client.UpdateOptions{})
err = r.Client.Status().Update(ctx, pbc, &client.SubResourceUpdateOptions{})
if err != nil {
r.Log.Error(err, "updating ignored status")
return withoutRequeue(result), nil
Expand Down
6 changes: 3 additions & 3 deletions controllers/packagebundlecontroller_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ func TestPackageBundleControllerReconcilerReconcile(t *testing.T) {
}

setMockPBC := func(src *api.PackageBundleController) func(ctx context.Context,
name types.NamespacedName, pbc *api.PackageBundleController) error {
name types.NamespacedName, pbc *api.PackageBundleController, _ ...client.GetOption) error {
return func(ctx context.Context, name types.NamespacedName,
target *api.PackageBundleController) error {
target *api.PackageBundleController, _ ...client.GetOption) error {
src.DeepCopyInto(target)
return nil
}
Expand Down Expand Up @@ -121,7 +121,7 @@ func TestPackageBundleControllerReconcilerReconcile(t *testing.T) {
mockClient.EXPECT().Status().Return(mockStatusClient)
mockStatusClient.EXPECT().Update(ctx, gomock.Any(), gomock.Any()).
DoAndReturn(func(ctx context.Context, pbc *api.PackageBundleController,
opts *client.UpdateOptions) error {
opts *client.SubResourceUpdateOptions) error {
assert.Equal(t, pbc.Status.State, api.BundleControllerStateIgnored)
return nil
})
Expand Down
51 changes: 25 additions & 26 deletions generatebundlefile/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ require (
github.com/pkg/errors v0.9.1
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.10.3
k8s.io/apimachinery v0.25.3
sigs.k8s.io/controller-runtime v0.11.1
k8s.io/apimachinery v0.26.1
sigs.k8s.io/controller-runtime v0.14.4
sigs.k8s.io/yaml v1.3.0
)

Expand All @@ -36,8 +36,6 @@ require (
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Masterminds/squirrel v1.5.3 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.10.0 // indirect
Expand All @@ -64,16 +62,17 @@ require (
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
Expand Down Expand Up @@ -108,13 +107,13 @@ require (
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
Expand All @@ -123,10 +122,10 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rubenv/sql-migrate v1.2.0 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
Expand All @@ -147,32 +146,32 @@ require (
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.3.0 // indirect
golang.org/x/net v0.2.0 // indirect
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/term v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.25.3 // indirect
k8s.io/apiextensions-apiserver v0.25.3 // indirect
k8s.io/apiserver v0.25.3 // indirect
k8s.io/api v0.26.1 // indirect
k8s.io/apiextensions-apiserver v0.26.1 // indirect
k8s.io/apiserver v0.26.1 // indirect
k8s.io/cli-runtime v0.25.3 // indirect
k8s.io/client-go v0.25.3 // indirect
k8s.io/component-base v0.25.3 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/client-go v0.26.1 // indirect
k8s.io/component-base v0.26.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kubectl v0.25.3 // indirect
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
oras.land/oras-go v1.2.0 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
Expand Down
Loading