Skip to content

Commit

Permalink
deps: update controller-runtime (#58)
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Santos <nick.santos@docker.com>

Signed-off-by: Nick Santos <nick.santos@docker.com>
  • Loading branch information
nicks committed Sep 19, 2022
1 parent 8201831 commit f1bf501
Show file tree
Hide file tree
Showing 534 changed files with 19,964 additions and 7,418 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ orbs:
jobs:
build:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
working_directory: /home/circleci/go/src/github.com/tilt-dev/tilt-apiserver
steps:
- checkout
Expand Down
30 changes: 15 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/tilt-dev/tilt-apiserver

go 1.18
go 1.19

require (
github.com/akutz/memconn v0.1.0
Expand All @@ -9,15 +9,15 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
k8s.io/api v0.24.3
k8s.io/apimachinery v0.24.3
k8s.io/apiserver v0.24.3
k8s.io/client-go v0.24.3
k8s.io/code-generator v0.24.3
k8s.io/component-base v0.24.3
k8s.io/api v0.25.0
k8s.io/apimachinery v0.25.0
k8s.io/apiserver v0.25.0
k8s.io/client-go v0.25.0
k8s.io/code-generator v0.25.0
k8s.io/component-base v0.25.0
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
sigs.k8s.io/controller-runtime v0.12.3
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
sigs.k8s.io/controller-runtime v0.13.0
)

require (
Expand All @@ -29,8 +29,9 @@ require (
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
Expand Down Expand Up @@ -78,16 +79,15 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220802222814-0bcc04d9c69b // indirect
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect
golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
golang.org/x/tools v0.1.12 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220802133213-ce4fa296bf78 // indirect
Expand All @@ -97,7 +97,7 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.24.3 // indirect
k8s.io/apiextensions-apiserver v0.25.0 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
Expand Down
287 changes: 34 additions & 253 deletions go.sum

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions pkg/generated/clientset/versioned/fake/register.go

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

14 changes: 7 additions & 7 deletions pkg/generated/clientset/versioned/scheme/register.go

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

11 changes: 2 additions & 9 deletions pkg/generated/openapi/zz_generated.openapi.go

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

4 changes: 4 additions & 0 deletions pkg/server/builder/storage_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ type statusStorage struct {
registryrest.Getter
}

func (s *statusStorage) Destroy() {
// Destroy() is intended for cleaning up client connections. Do nothing.
}

type statusProvider struct {
Provider rest.ResourceHandlerProvider
}
Expand Down
15 changes: 11 additions & 4 deletions pkg/storage/filepath/jsonfile_rest.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ func (f *filepathREST) NewList() runtime.Object {
return f.newListFunc()
}

func (f *filepathREST) Destroy() {
// Destroy() is intended for cleaning up client connections. Do nothing.
}

func (f *filepathREST) NamespaceScoped() bool {
return f.strategy.NamespaceScoped()
}
Expand Down Expand Up @@ -146,6 +150,13 @@ func (f *filepathREST) Create(
createValidation rest.ValidateObjectFunc,
options *metav1.CreateOptions,
) (runtime.Object, error) {

accessor, err := meta.Accessor(obj)
if err != nil {
return nil, err
}
rest.FillObjectMetaSystemFields(accessor)

if err := rest.BeforeCreate(f.strategy, ctx, obj); err != nil {
return nil, err
}
Expand All @@ -167,10 +178,6 @@ func (f *filepathREST) Create(
}
}

accessor, err := meta.Accessor(obj)
if err != nil {
return nil, err
}
filename := f.objectFileName(ctx, accessor.GetName())

if f.fs.Exists(filename) {
Expand Down
5 changes: 0 additions & 5 deletions vendor/github.com/emicklei/go-restful/Makefile

This file was deleted.

1 change: 1 addition & 0 deletions vendor/github.com/emicklei/go-restful/v3/.goconvey

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

Loading

0 comments on commit f1bf501

Please sign in to comment.