Skip to content

Commit 2c2b55d

Browse files
authored
Merge branch 'main' into use-clientgo-watcher
2 parents e69ad76 + 041752c commit 2c2b55d

File tree

4 files changed

+80
-78
lines changed

4 files changed

+80
-78
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ We strive to maintain a relatively minimal dependency footprint, but some depend
44

55
## Maintainers
66

7-
Maintainers are limited to AWS employees, but we may consider external contributions and bug fixes. This project is maintained in service of a set of projects well known to the maintainers. We will not consider feature requests unless they are in direct support of these projects. For example, we are delighted to accept contributions from the community behind https://github.com/aws/karpenter-core. Before depending on this package, please speak with the maintainers.
7+
Maintainers are limited to AWS employees, but we may consider external contributions and bug fixes. This project is maintained in service of a set of projects well known to the maintainers. We will not consider feature requests unless they are in direct support of these projects. For example, we are delighted to accept contributions from the community behind https://github.com/kubernetes-sigs/karpenter. Before depending on this package, please speak with the maintainers.
88

99
## Versioning
1010

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ require (
66
github.com/Pallinder/go-randomdata v1.2.0
77
github.com/go-logr/zapr v1.3.0
88
github.com/imdario/mergo v0.3.16
9-
github.com/onsi/ginkgo/v2 v2.22.0
10-
github.com/onsi/gomega v1.36.0
9+
github.com/onsi/ginkgo/v2 v2.22.2
10+
github.com/onsi/gomega v1.36.2
1111
github.com/prometheus/client_golang v1.20.5
1212
github.com/prometheus/client_model v0.6.1
1313
github.com/samber/lo v1.47.0
1414
go.uber.org/zap v1.27.0
15-
golang.org/x/time v0.8.0
16-
k8s.io/api v0.31.3
17-
k8s.io/apimachinery v0.31.3
18-
k8s.io/client-go v0.31.3
15+
golang.org/x/time v0.9.0
16+
k8s.io/api v0.32.1
17+
k8s.io/apimachinery v0.32.1
18+
k8s.io/client-go v0.32.1
1919
k8s.io/klog/v2 v2.130.1
20-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
21-
sigs.k8s.io/controller-runtime v0.19.3
20+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
21+
sigs.k8s.io/controller-runtime v0.20.0
2222
sigs.k8s.io/yaml v1.4.0
2323
)
2424

@@ -29,19 +29,20 @@ require (
2929
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3030
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3131
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
32+
github.com/fsnotify/fsnotify v1.7.0 // indirect
3233
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3334
github.com/go-logr/logr v1.4.2 // indirect
34-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
35+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3536
github.com/go-openapi/jsonreference v0.20.2 // indirect
36-
github.com/go-openapi/swag v0.22.4 // indirect
37+
github.com/go-openapi/swag v0.23.0 // indirect
3738
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3839
github.com/gogo/protobuf v1.3.2 // indirect
39-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4040
github.com/golang/protobuf v1.5.4 // indirect
41+
github.com/google/btree v1.1.3 // indirect
4142
github.com/google/gnostic-models v0.6.8 // indirect
4243
github.com/google/go-cmp v0.6.0 // indirect
4344
github.com/google/gofuzz v1.2.0 // indirect
44-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
45+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
4546
github.com/google/uuid v1.6.0 // indirect
4647
github.com/josharian/intern v1.0.0 // indirect
4748
github.com/json-iterator/go v1.1.12 // indirect
@@ -56,21 +57,20 @@ require (
5657
github.com/spf13/pflag v1.0.5 // indirect
5758
github.com/x448/float16 v0.8.4 // indirect
5859
go.uber.org/multierr v1.11.0 // indirect
59-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
60-
golang.org/x/net v0.30.0 // indirect
61-
golang.org/x/oauth2 v0.21.0 // indirect
62-
golang.org/x/sys v0.26.0 // indirect
63-
golang.org/x/term v0.25.0 // indirect
64-
golang.org/x/text v0.19.0 // indirect
65-
golang.org/x/tools v0.26.0 // indirect
60+
golang.org/x/net v0.33.0 // indirect
61+
golang.org/x/oauth2 v0.23.0 // indirect
62+
golang.org/x/sync v0.10.0 // indirect
63+
golang.org/x/sys v0.28.0 // indirect
64+
golang.org/x/term v0.27.0 // indirect
65+
golang.org/x/text v0.21.0 // indirect
66+
golang.org/x/tools v0.28.0 // indirect
6667
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
67-
google.golang.org/protobuf v1.35.1 // indirect
68+
google.golang.org/protobuf v1.36.1 // indirect
6869
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6970
gopkg.in/inf.v0 v0.9.1 // indirect
70-
gopkg.in/yaml.v2 v2.4.0 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
72-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
73-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
74-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
75-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
72+
k8s.io/apiextensions-apiserver v0.32.0 // indirect
73+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
74+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
75+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
7676
)

0 commit comments

Comments
 (0)