Skip to content

Commit 02fe7bf

Browse files
authored
Pin k8s.io/{apimachinery|api|client-go} to v0.26.1 (#119)
Addresses aws-controllers-k8s/community#1719 This patch updates `k8s.io/{apimachinery|api|client-go}` to `v0.26.1` and fixes the generated/usage of the mocks used for unit testing. Note that `controller-runtime/pkg/client/StatusWriter` is no longer declared properly, and [is a copy of `SubResourceWriter` now.](https://github.com/kubernetes-sigs/controller-runtime/blob/main/pkg/client/interfaces.go#L132-L133) Changes to the mocks: - Brings and uses `SubResourceWriter` instead of `StatusWriter` - Removes `TestMetaV1ObjectEqual_ClusterName` (deprecated field) and test `TestMetaV1ObjectEqual_RemainingItemCount` instead - Get rid of unused mock files (`rm -rf ./mocks && make mocks`) Changes to the go modules: - Pin `k8s.io/{apimachinery|api|client-go}` to `v0.26.1` - `go mod tidy` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent a8bd391 commit 02fe7bf

File tree

18 files changed

+518
-979
lines changed

18 files changed

+518
-979
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mocks: install-mockery ## Build mocks
3333
@bin/mockery --quiet --name=ObjectKind --case=underscore --output=mocks/apimachinery/pkg/runtime/schema --dir="$(K8S_APIMACHINERY_DIR)/pkg/runtime/schema"
3434
@echo "ok."
3535
@echo -n "building mocks for sigs.k8s.io/controller-runtime/pkg/client ... "
36-
@bin/mockery --quiet --name="(Object|Client|Status|Reader)" --case=underscore --output=mocks/controller-runtime/pkg/client --dir="$(CONTROLLER_RUNTIME_DIR)/pkg/client"
36+
@bin/mockery --quiet --name="(Object|Client|Status|Reader|SubResourceWriter)" --case=underscore --output=mocks/controller-runtime/pkg/client --dir="$(CONTROLLER_RUNTIME_DIR)/pkg/client"
3737
@echo "ok."
3838

3939
help: ## Show this help.

go.mod

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,77 @@ go 1.19
44

55
require (
66
github.com/aws/aws-sdk-go v1.44.93
7-
github.com/cenkalti/backoff/v4 v4.1.2
8-
github.com/go-logr/logr v1.2.0
9-
github.com/google/go-cmp v0.5.5
7+
github.com/cenkalti/backoff/v4 v4.1.3
8+
github.com/go-logr/logr v1.2.3
9+
github.com/google/go-cmp v0.5.9
1010
github.com/itchyny/gojq v0.12.6
1111
github.com/jaypipes/envutil v1.0.0
1212
github.com/pkg/errors v0.9.1
13-
github.com/prometheus/client_golang v1.11.1
13+
github.com/prometheus/client_golang v1.14.0
1414
github.com/samber/lo v1.37.0
1515
github.com/spf13/pflag v1.0.5
16-
github.com/stretchr/testify v1.7.0
17-
go.uber.org/zap v1.19.1
18-
k8s.io/api v0.23.0
19-
k8s.io/apimachinery v0.23.0
20-
k8s.io/client-go v0.23.0
21-
sigs.k8s.io/controller-runtime v0.11.0
16+
github.com/stretchr/testify v1.8.0
17+
go.uber.org/zap v1.24.0
18+
k8s.io/api v0.26.1
19+
k8s.io/apimachinery v0.26.1
20+
k8s.io/client-go v0.26.1
21+
sigs.k8s.io/controller-runtime v0.14.5
2222
)
2323

2424
require (
2525
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
26+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2727
github.com/davecgh/go-spew v1.1.1 // indirect
28+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2829
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
29-
github.com/fsnotify/fsnotify v1.5.1 // indirect
30-
github.com/go-logr/zapr v1.2.0 // indirect
30+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
31+
github.com/fsnotify/fsnotify v1.6.0 // indirect
32+
github.com/go-logr/zapr v1.2.3 // indirect
33+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
34+
github.com/go-openapi/jsonreference v0.20.0 // indirect
35+
github.com/go-openapi/swag v0.19.14 // indirect
3136
github.com/gogo/protobuf v1.3.2 // indirect
3237
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3338
github.com/golang/protobuf v1.5.2 // indirect
39+
github.com/google/gnostic v0.5.7-v3refs // indirect
3440
github.com/google/gofuzz v1.1.0 // indirect
3541
github.com/google/uuid v1.1.2 // indirect
36-
github.com/googleapis/gnostic v0.5.5 // indirect
3742
github.com/imdario/mergo v0.3.12 // indirect
3843
github.com/itchyny/timefmt-go v0.1.3 // indirect
3944
github.com/jmespath/go-jmespath v0.4.0 // indirect
45+
github.com/josharian/intern v1.0.0 // indirect
4046
github.com/json-iterator/go v1.1.12 // indirect
41-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
47+
github.com/mailru/easyjson v0.7.6 // indirect
48+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
4249
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4350
github.com/modern-go/reflect2 v1.0.2 // indirect
51+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4452
github.com/pmezard/go-difflib v1.0.0 // indirect
45-
github.com/prometheus/client_model v0.2.0 // indirect
46-
github.com/prometheus/common v0.28.0 // indirect
47-
github.com/prometheus/procfs v0.6.0 // indirect
48-
github.com/stretchr/objx v0.1.1 // indirect
53+
github.com/prometheus/client_model v0.3.0 // indirect
54+
github.com/prometheus/common v0.37.0 // indirect
55+
github.com/prometheus/procfs v0.8.0 // indirect
56+
github.com/stretchr/objx v0.4.0 // indirect
4957
go.uber.org/atomic v1.7.0 // indirect
5058
go.uber.org/multierr v1.6.0 // indirect
5159
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
52-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
53-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
54-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
55-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
56-
golang.org/x/text v0.3.7 // indirect
57-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
60+
golang.org/x/net v0.7.0 // indirect
61+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
62+
golang.org/x/sys v0.5.0 // indirect
63+
golang.org/x/term v0.5.0 // indirect
64+
golang.org/x/text v0.7.0 // indirect
65+
golang.org/x/time v0.3.0 // indirect
5866
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
5967
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/protobuf v1.27.1 // indirect
68+
google.golang.org/protobuf v1.28.1 // indirect
6169
gopkg.in/inf.v0 v0.9.1 // indirect
6270
gopkg.in/yaml.v2 v2.4.0 // indirect
63-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
64-
k8s.io/apiextensions-apiserver v0.23.0 // indirect
65-
k8s.io/component-base v0.23.0 // indirect
66-
k8s.io/klog/v2 v2.30.0 // indirect
67-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
68-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
69-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
70-
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
71+
gopkg.in/yaml.v3 v3.0.1 // indirect
72+
k8s.io/apiextensions-apiserver v0.26.1 // indirect
73+
k8s.io/component-base v0.26.1 // indirect
74+
k8s.io/klog/v2 v2.80.1 // indirect
75+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
76+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
77+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
78+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7179
sigs.k8s.io/yaml v1.3.0 // indirect
7280
)

0 commit comments

Comments
 (0)