Skip to content

Commit

Permalink
Merge pull request kubernetes#5446 from jayantjain93/scheduler-fix-re…
Browse files Browse the repository at this point in the history
…lease-1.25

update vendor to v1.25.6 due to kubernetes#5372
  • Loading branch information
k8s-ci-robot authored Jan 25, 2023
2 parents e8d3e9b + f3b4eba commit 479a31d
Show file tree
Hide file tree
Showing 285 changed files with 22,475 additions and 3,702 deletions.
91 changes: 45 additions & 46 deletions cluster-autoscaler/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/gofrs/uuid v4.0.0+incompatible
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.6
github.com/google/go-cmp v0.5.8
github.com/google/go-querystring v1.0.0
github.com/google/uuid v1.1.2
github.com/jmespath/go-jmespath v0.4.0
Expand All @@ -25,25 +25,25 @@ require (
github.com/prometheus/client_golang v1.12.1
github.com/satori/go.uuid v1.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.2
github.com/stretchr/testify v1.8.0
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
google.golang.org/api v0.60.0
google.golang.org/grpc v1.47.0
google.golang.org/protobuf v1.28.0
gopkg.in/gcfg.v1 v1.2.0
gopkg.in/yaml.v2 v2.4.0
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/cloud-provider v0.25.0
k8s.io/component-base v0.25.0
k8s.io/component-helpers v0.25.0
k8s.io/api v0.25.6
k8s.io/apimachinery v0.25.6
k8s.io/apiserver v0.25.6
k8s.io/client-go v0.25.6
k8s.io/cloud-provider v0.25.6
k8s.io/component-base v0.25.6
k8s.io/component-helpers v0.25.6
k8s.io/klog/v2 v2.70.1
k8s.io/kubelet v0.24.1
k8s.io/kubernetes v1.25.0
k8s.io/kubernetes v1.25.6
k8s.io/legacy-cloud-providers v0.0.0
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
sigs.k8s.io/cloud-provider-azure v1.24.2
Expand Down Expand Up @@ -138,7 +138,7 @@ require (
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cobra v1.4.0 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/vishvananda/netlink v1.1.0 // indirect
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
Expand All @@ -163,25 +163,24 @@ require (
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/warnings.v0 v0.1.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cri-api v0.0.0 // indirect
k8s.io/csi-translation-lib v0.25.0 // indirect
k8s.io/csi-translation-lib v0.25.6 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/kube-proxy v0.0.0 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/mount-utils v0.25.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
k8s.io/mount-utils v0.25.6 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand All @@ -193,56 +192,56 @@ replace github.com/digitalocean/godo => github.com/digitalocean/godo v1.27.0

replace github.com/rancher/go-rancher => github.com/rancher/go-rancher v0.1.0

replace k8s.io/api => k8s.io/api v0.25.0
replace k8s.io/api => k8s.io/api v0.25.6

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.6

replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.0-alpha.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.25.7-rc.0

replace k8s.io/apiserver => k8s.io/apiserver v0.25.0
replace k8s.io/apiserver => k8s.io/apiserver v0.25.6

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.6

replace k8s.io/client-go => k8s.io/client-go v0.25.0
replace k8s.io/client-go => k8s.io/client-go v0.25.6

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.0
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.6

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.6

replace k8s.io/code-generator => k8s.io/code-generator v0.25.1-rc.0
replace k8s.io/code-generator => k8s.io/code-generator v0.25.7-rc.0

replace k8s.io/component-base => k8s.io/component-base v0.25.0
replace k8s.io/component-base => k8s.io/component-base v0.25.6

replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.0
replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.6

replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.0
replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.6

replace k8s.io/cri-api => k8s.io/cri-api v0.25.1-rc.0
replace k8s.io/cri-api => k8s.io/cri-api v0.25.7-rc.0

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.0
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.6

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.6

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.6

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.6

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.6

replace k8s.io/kubectl => k8s.io/kubectl v0.25.0
replace k8s.io/kubectl => k8s.io/kubectl v0.25.6

replace k8s.io/kubelet => k8s.io/kubelet v0.25.0
replace k8s.io/kubelet => k8s.io/kubelet v0.25.6

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.0
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.6

replace k8s.io/metrics => k8s.io/metrics v0.25.0
replace k8s.io/metrics => k8s.io/metrics v0.25.6

replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.1-rc.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.7-rc.0

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.6

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.0
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.6

replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.0
replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.6

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.6
Loading

0 comments on commit 479a31d

Please sign in to comment.