Skip to content

Commit

Permalink
Bump the kubernetes group with 3 updates (#439)
Browse files Browse the repository at this point in the history 
* Bump the kubernetes group with 3 updates

Bumps the kubernetes group with 3 updates: [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery), [k8s.io/client-go](https://github.com/kubernetes/client-go) and [k8s.io/utils](https://github.com/kubernetes/utils).


Updates `k8s.io/apimachinery` from 0.30.3 to 0.31.0
- [Commits](kubernetes/apimachinery@v0.30.3...v0.31.0)

Updates `k8s.io/client-go` from 0.30.3 to 0.31.0
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.30.3...v0.31.0)

Updates `k8s.io/utils` from 0.0.0-20240102154912-e7106e64919e to 0.0.0-20240711033017-18e509b52bc8
- [Commits](https://github.com/kubernetes/utils/commits)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: kubernetes
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: kubernetes
- dependency-name: k8s.io/utils
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: kubernetes
...

Signed-off-by: dependabot[bot] <[email protected]>

* update other libs that depend on k8s apis

Signed-off-by: Scott Andrews <[email protected]>

* handle new workqueue types

Signed-off-by: Scott Andrews <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Scott Andrews <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Scott Andrews <[email protected]>
  • Loading branch information
@dependabot @scothis
dependabot[bot] and scothis authored Aug 15, 2024
1 parent c41ee86 commit 5228095
Show file tree
Hide file tree
Showing 6 changed files with 123 additions and 137 deletions.
2 changes: 1 addition & 1 deletion controllers/webhook_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func TriggerWebhook(c reconcilers.Config, serviceBindingController controller.Co
// queue is not populated yet
return nil
}
queue := queueValue.Interface().(workqueue.Interface)
queue := queueValue.Interface().(workqueue.TypedInterface[reconcile.Request])

obs, err := c.Tracker.GetObservers(trigger)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions controllers/webhook_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -748,14 +748,14 @@ func TestTriggerWebhook(t *testing.T) {
tc.Metadata = map[string]interface{}{}
}
tc.CleanUp = func(t *testing.T, ctx context.Context, tc *rtesting.AdmissionWebhookTestCase) error {
queue, ok := tc.Metadata["queue"].(workqueue.Interface)
queue, ok := tc.Metadata["queue"].(workqueue.TypedInterface[reconcile.Request])
if !ok {
return nil
}
actualRequests := []reconcile.Request{}
for len(actualRequests) < queue.Len() {
request, _ := queue.Get()
actualRequests = append(actualRequests, request.(reconcile.Request))
actualRequests = append(actualRequests, request)
}
expectedRequests := tc.Metadata["expectedRequests"].([]reconcile.Request)
if diff := cmp.Diff(expectedRequests, actualRequests); diff != "" {
Expand All @@ -764,7 +764,7 @@ func TestTriggerWebhook(t *testing.T) {
return nil
}

queue, _ := tc.Metadata["queue"].(workqueue.Interface)
queue, _ := tc.Metadata["queue"].(workqueue.TypedInterface[reconcile.Request])
ctrl := &mockController{
Queue: queue,
}
Expand Down Expand Up @@ -1201,7 +1201,7 @@ func allowSelfSubjectAccessReviewFor(group, resource, verb string) rtesting.Reac
var _ controller.Controller = (*mockController)(nil)

type mockController struct {
Queue workqueue.Interface
Queue workqueue.TypedInterface[reconcile.Request]
}

func (c *mockController) Reconcile(context.Context, reconcile.Request) (reconcile.Result, error) {
Expand Down
51 changes: 26 additions & 25 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ require (
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.9.0
gomodules.xyz/jsonpatch/v2 v2.4.0
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
k8s.io/client-go v0.30.3
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
reconciler.io/dies v0.13.0
reconciler.io/runtime v0.20.0
sigs.k8s.io/controller-runtime v0.18.5
k8s.io/api v0.31.0
k8s.io/apimachinery v0.31.0
k8s.io/client-go v0.31.0
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
reconciler.io/dies v0.14.0
reconciler.io/runtime v0.21.1
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
Expand All @@ -46,31 +46,32 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v3 v3.0.1 // indirect
gomodules.xyz/orderedmap v0.1.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.30.1 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/apiextensions-apiserver v0.31.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
Loading

0 comments on commit 5228095

Please sign in to comment.