Skip to content

Commit

Permalink
Merge pull request #832 from Huang-Wei/bump-k8s-v1.31.2
Browse files Browse the repository at this point in the history
bump k8s deps to v1.31.2
  • Loading branch information
k8s-ci-robot authored Dec 2, 2024
2 parents 65920ca + 9e1d98e commit cc8def2
Show file tree
Hide file tree
Showing 37 changed files with 1,467 additions and 832 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ hack/tools/bin/*
*.swp
*.sublime-project
*.sublime-workspace
*~
*~

# Ignore vendor/
vendor
2 changes: 1 addition & 1 deletion config/crd/bases/scheduling.x-k8s.io_elasticquotas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/52
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.5
name: elasticquotas.scheduling.x-k8s.io
spec:
group: scheduling.x-k8s.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/scheduling.x-k8s.io_podgroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/50
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.5
name: podgroups.scheduling.x-k8s.io
spec:
group: scheduling.x-k8s.io
Expand Down
219 changes: 108 additions & 111 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,179 +7,176 @@ require (
github.com/diktyo-io/appgroup-api v1.0.1-alpha
github.com/diktyo-io/networktopology-api v1.0.1-alpha
github.com/dustin/go-humanize v1.0.1
github.com/go-logr/logr v1.4.1
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.2
github.com/k8stopologyawareschedwg/podfingerprint v0.2.2
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/paypal/load-watcher v0.2.3
github.com/paypal/load-watcher v0.2.4
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
gonum.org/v1/gonum v0.12.0
k8s.io/api v0.30.6
k8s.io/apimachinery v0.30.6
k8s.io/apiserver v0.30.6
k8s.io/client-go v0.30.6
k8s.io/code-generator v0.30.6
k8s.io/component-base v0.30.6
k8s.io/component-helpers v0.30.6
k8s.io/klog/hack/tools v0.0.0-20210917071902-331d2323a192
k8s.io/klog/v2 v2.120.1
k8s.io/kube-scheduler v0.30.6
k8s.io/kubernetes v1.30.6
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.18.5
k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/apiserver v0.31.2
k8s.io/client-go v0.31.2
k8s.io/code-generator v0.31.2
k8s.io/component-base v0.31.2
k8s.io/component-helpers v0.31.2
k8s.io/klog/v2 v2.130.1
k8s.io/kube-scheduler v0.31.2
k8s.io/kubernetes v1.31.2
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.19.2
sigs.k8s.io/logtools v0.9.0
sigs.k8s.io/security-profiles-operator v0.4.0
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // 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/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/crossplane/crossplane-runtime v0.14.1-0.20210713194031-85b19c28ea88 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // 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.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/godbus/dbus/v5 v5.1.0 // 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.4 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/cel-go v0.20.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/google/uuid v1.6.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/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff 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/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/moby/term v0.5.0 // 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/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/runc v1.1.13 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.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/seccomp/libseccomp-golang v0.10.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // 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.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // 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.18.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.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/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.30.6 // indirect
k8s.io/cloud-provider v0.30.6 // indirect
k8s.io/controller-manager v0.30.6 // indirect
k8s.io/csi-translation-lib v0.30.6 // indirect
k8s.io/dynamic-resource-allocation v0.30.6 // indirect
k8s.io/apiextensions-apiserver v0.31.2 // indirect
k8s.io/cloud-provider v0.31.2 // indirect
k8s.io/controller-manager v0.31.2 // indirect
k8s.io/csi-translation-lib v0.31.2 // indirect
k8s.io/dynamic-resource-allocation v0.31.2 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kms v0.30.6 // indirect
k8s.io/kms v0.31.2 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubelet v0.30.6 // indirect
k8s.io/metrics v0.30.6 // indirect
k8s.io/mount-utils v0.30.6 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
k8s.io/kubelet v0.31.2 // indirect
k8s.io/metrics v0.31.2 // indirect
k8s.io/mount-utils v0.31.2 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/release-utils v0.3.0 // indirect
)

replace (
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.21.0
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.21.0
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.21.0
k8s.io/api => k8s.io/api v0.30.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.6
k8s.io/apimachinery => k8s.io/apimachinery v0.30.6
k8s.io/apiserver => k8s.io/apiserver v0.30.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.6
k8s.io/client-go => k8s.io/client-go v0.30.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.6
k8s.io/code-generator => k8s.io/code-generator v0.30.6
k8s.io/component-base => k8s.io/component-base v0.30.6
k8s.io/component-helpers => k8s.io/component-helpers v0.30.6
k8s.io/controller-manager => k8s.io/controller-manager v0.30.6
k8s.io/cri-api => k8s.io/cri-api v0.30.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.6
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.6
k8s.io/endpointslice => k8s.io/endpointslice v0.30.6
k8s.io/kms => k8s.io/kms v0.30.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.6
k8s.io/kubectl => k8s.io/kubectl v0.30.6
k8s.io/kubelet => k8s.io/kubelet v0.30.6
k8s.io/kubernetes => k8s.io/kubernetes v1.30.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.6
k8s.io/metrics => k8s.io/metrics v0.30.6
k8s.io/mount-utils => k8s.io/mount-utils v0.30.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.6
k8s.io/api => k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery => k8s.io/apimachinery v0.31.2
k8s.io/apiserver => k8s.io/apiserver v0.31.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.2
k8s.io/client-go => k8s.io/client-go v0.31.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.2
k8s.io/code-generator => k8s.io/code-generator v0.31.2
k8s.io/component-base => k8s.io/component-base v0.31.2
k8s.io/component-helpers => k8s.io/component-helpers v0.31.2
k8s.io/controller-manager => k8s.io/controller-manager v0.31.2
k8s.io/cri-api => k8s.io/cri-api v0.31.2
k8s.io/cri-client => k8s.io/cri-client v0.31.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.2
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.2
k8s.io/endpointslice => k8s.io/endpointslice v0.31.2
k8s.io/kms => k8s.io/kms v0.31.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.2
k8s.io/kubectl => k8s.io/kubectl v0.31.2
k8s.io/kubelet => k8s.io/kubelet v0.31.2
k8s.io/kubernetes => k8s.io/kubernetes v1.31.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.2
k8s.io/metrics => k8s.io/metrics v0.31.2
k8s.io/mount-utils => k8s.io/mount-utils v0.31.2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.2
)
Loading

0 comments on commit cc8def2

Please sign in to comment.