Skip to content

Commit

Permalink
bump k8s deps to 1.30 and update codegen
Browse files Browse the repository at this point in the history
  • Loading branch information
@marwanad
marwanad committed Jun 24, 2024
1 parent f5a2546 commit bf71f85
Show file tree
Hide file tree
Showing 56 changed files with 1,734 additions and 376 deletions.
5 changes: 4 additions & 1 deletion cmd/agent/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import (
"k8s.io/sample-controller/pkg/signals"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
)

// TODO standardize logging
Expand Down Expand Up @@ -280,7 +281,9 @@ func addClusterScopedFactoriesAndControllers(

func startWebhook(ctx context.Context, cfg *rest.Config, agentCfg agentconfig.Config) {
mgr, err := manager.New(cfg, manager.Options{
MetricsBindAddress: "0",
Metrics: metricsserver.Options{
BindAddress: "0",
},
HealthProbeBindAddress: ":8080",
})
utilruntime.Must(err)
Expand Down
216 changes: 108 additions & 108 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,200 +1,200 @@
module admiralty.io/multicluster-scheduler

go 1.20
go 1.22.0

require (
admiralty.io/multicluster-service-account v0.6.1
github.com/go-test/deep v1.0.8
github.com/hashicorp/go-multierror v1.1.1
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.3
github.com/stretchr/testify v1.8.4
github.com/virtual-kubelet/virtual-kubelet v1.10.0
k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.4
k8s.io/client-go v0.27.4
k8s.io/code-generator v0.27.4
k8s.io/component-base v0.27.4
k8s.io/klog/v2 v2.90.1
k8s.io/kubernetes v1.27.4
k8s.io/sample-controller v0.27.4
sigs.k8s.io/controller-runtime v0.15.0
k8s.io/api v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/client-go v0.30.1
k8s.io/code-generator v0.30.0
k8s.io/component-base v0.30.1
k8s.io/klog/v2 v2.120.1
k8s.io/kube-scheduler v0.0.0
k8s.io/kubernetes v1.30.0
k8s.io/sample-controller v0.30.0
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.15.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.opentelemetry.io/proto/otlp v0.20.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sync v0.6.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/time v0.3.0 // indirect
golang.org/x/tools v0.9.1 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
golang.org/x/tools v0.18.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.55.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.27.4 // indirect
k8s.io/apiserver v0.27.4 // indirect
k8s.io/cloud-provider v0.27.4 // indirect
k8s.io/component-helpers v0.27.4 // indirect
k8s.io/controller-manager v0.27.4 // indirect
k8s.io/csi-translation-lib v0.27.4 // indirect
k8s.io/apiextensions-apiserver v0.30.1 // indirect
k8s.io/apiserver v0.30.1 // indirect
k8s.io/cloud-provider v0.30.0 // indirect
k8s.io/component-helpers v0.30.0 // indirect
k8s.io/controller-manager v0.30.0 // indirect
k8s.io/csi-translation-lib v0.30.0 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kms v0.27.4 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubelet v0.27.4 // indirect
k8s.io/mount-utils v0.27.4 // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kms v0.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubelet v0.30.0 // indirect
k8s.io/mount-utils v0.30.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

//replace google.golang.org/grpc => google.golang.org/grpc v1.29.1

replace k8s.io/api => k8s.io/api v0.27.4
replace k8s.io/api => k8s.io/api v0.30.0

replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.4
replace k8s.io/apimachinery => k8s.io/apimachinery v0.30.0

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.4
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0

replace k8s.io/apiserver => k8s.io/apiserver v0.27.4
replace k8s.io/apiserver => k8s.io/apiserver v0.30.0

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.4
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0

replace k8s.io/client-go => k8s.io/client-go v0.27.4
replace k8s.io/client-go => k8s.io/client-go v0.30.0

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.4
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.4
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0

replace k8s.io/code-generator => k8s.io/code-generator v0.27.4
replace k8s.io/code-generator => k8s.io/code-generator v0.30.0

replace k8s.io/component-base => k8s.io/component-base v0.27.4
replace k8s.io/component-base => k8s.io/component-base v0.30.0

replace k8s.io/cri-api => k8s.io/cri-api v0.27.4
replace k8s.io/cri-api => k8s.io/cri-api v0.30.0

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.4
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0

replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.4
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.0

replace k8s.io/kms => k8s.io/kms v0.27.4
replace k8s.io/kms => k8s.io/kms v0.30.0

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.4
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.4
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.4
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.4
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0

replace k8s.io/kubectl => k8s.io/kubectl v0.27.4
replace k8s.io/kubectl => k8s.io/kubectl v0.30.0

replace k8s.io/kubelet => k8s.io/kubelet v0.27.4
replace k8s.io/kubelet => k8s.io/kubelet v0.30.0

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.4
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0

replace k8s.io/metrics => k8s.io/metrics v0.27.4
replace k8s.io/metrics => k8s.io/metrics v0.30.0

replace k8s.io/node-api => k8s.io/node-api v0.27.4
replace k8s.io/node-api => k8s.io/node-api v0.30.0

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.4
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.4
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.0

replace k8s.io/sample-controller => k8s.io/sample-controller v0.27.4
replace k8s.io/sample-controller => k8s.io/sample-controller v0.30.0

replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.4
replace k8s.io/component-helpers => k8s.io/component-helpers v0.30.0

replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.4
replace k8s.io/controller-manager => k8s.io/controller-manager v0.30.0

replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.4
replace k8s.io/mount-utils => k8s.io/mount-utils v0.30.0

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.4
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0
Loading

0 comments on commit bf71f85

Please sign in to comment.