Skip to content

Commit

Permalink
DRA TMP: vendor in the required scheduler framework channges
Browse files Browse the repository at this point in the history 
DRA integration in CA needs changes in the scheduler framework. The
changes are currently in review in
kubernetes/kubernetes#127904. This commit
pulls these changes to vendor/ so that the PR can be tested and
iterated on.

Note that this also bumps all of CA's k8s dependencies, and there
was a breaking change in the scheduler framework - it seems that
InitMetrics() needs to be called before calling NewFramework() now.

DO NOT SUBMIT - instead, CA k8s deps should be synced after k/k#127904
is submitted (and the breaking change handled).
  • Loading branch information
@towca
towca committed Oct 7, 2024
1 parent 4d499a1 commit 1f39113
Show file tree
Hide file tree
Showing 11,043 changed files with 4,611,811 additions and 322 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
129 changes: 66 additions & 63 deletions cluster-autoscaler/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module k8s.io/autoscaler/cluster-autoscaler

go 1.22.0

toolchain go1.22.4
go 1.23.0

require (
cloud.google.com/go/compute/metadata v0.3.0
Expand Down Expand Up @@ -34,9 +32,9 @@ require (
github.com/stretchr/testify v1.9.0
github.com/vburenin/ifacemaker v1.2.1
go.uber.org/mock v0.4.0
golang.org/x/net v0.26.0
golang.org/x/net v0.28.0
golang.org/x/oauth2 v0.21.0
golang.org/x/sys v0.21.0
golang.org/x/sys v0.23.0
google.golang.org/api v0.151.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
Expand Down Expand Up @@ -82,8 +80,8 @@ require (
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.25.0 // indirect
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/Microsoft/hcsshim v0.8.26 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.12.7-0.20241003002528-bafd4c013fbd // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect
Expand All @@ -92,18 +90,22 @@ require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
github.com/cilium/ebpf v0.9.1 // indirect
github.com/cilium/ebpf v0.11.0 // indirect
github.com/container-storage-interface/spec v1.9.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/ttrpc v1.2.2 // indirect
github.com/containerd/cgroups/v3 v3.0.3 // indirect
github.com/containerd/console v1.0.4 // indirect
github.com/containerd/containerd/api v1.7.19 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/ttrpc v1.2.5 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/dave/jennifer v1.6.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
Expand All @@ -113,28 +115,27 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cadvisor v0.49.0 // indirect
github.com/google/cel-go v0.20.1 // indirect
github.com/google/cadvisor v0.50.0 // indirect
github.com/google/cel-go v0.21.0 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.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.20.0 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jessevdk/go-flags v1.4.1-0.20181029123624-5de817a9aa20 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -155,8 +156,8 @@ require (
github.com/onsi/ginkgo/v2 v2.19.0 // indirect
github.com/onsi/gomega v1.33.1 // 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/runc v1.1.14 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand All @@ -169,12 +170,12 @@ require (
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/vishvananda/netlink v1.1.0 // indirect
github.com/vishvananda/netlink v1.3.0 // indirect
github.com/vishvananda/netns v0.0.4 // 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.etcd.io/etcd/api/v3 v3.5.16 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
Expand All @@ -187,15 +188,15 @@ require (
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.24.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/sync v0.8.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
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/tools v0.24.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
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
Expand All @@ -210,9 +211,9 @@ require (
k8s.io/cri-client v0.0.0 // indirect
k8s.io/csi-translation-lib v0.27.0 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
k8s.io/kms v0.31.0-beta.0 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubectl v0.28.0 // indirect
k8s.io/mount-utils v0.26.0-alpha.0 // indirect
Expand All @@ -228,64 +229,66 @@ 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.31.0-beta.0
replace k8s.io/api => ./../../kubernetes/staging/src/k8s.io/api

replace k8s.io/apiextensions-apiserver => ./../../kubernetes/staging/src/k8s.io/apiextensions-apiserver

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0-beta.0
replace k8s.io/apimachinery => ./../../kubernetes/staging/src/k8s.io/apimachinery

replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.0-beta.0
replace k8s.io/apiserver => ./../../kubernetes/staging/src/k8s.io/apiserver

replace k8s.io/apiserver => k8s.io/apiserver v0.31.0-beta.0
replace k8s.io/cli-runtime => ./../../kubernetes/staging/src/k8s.io/cli-runtime

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0-beta.0
replace k8s.io/client-go => ./../../kubernetes/staging/src/k8s.io/client-go

replace k8s.io/client-go => k8s.io/client-go v0.31.0-beta.0
replace k8s.io/cloud-provider => ./../../kubernetes/staging/src/k8s.io/cloud-provider

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0-beta.0
replace k8s.io/cluster-bootstrap => ./../../kubernetes/staging/src/k8s.io/cluster-bootstrap

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0-beta.0
replace k8s.io/code-generator => ./../../kubernetes/staging/src/k8s.io/code-generator

replace k8s.io/code-generator => k8s.io/code-generator v0.31.0-beta.0
replace k8s.io/component-base => ./../../kubernetes/staging/src/k8s.io/component-base

replace k8s.io/component-base => k8s.io/component-base v0.31.0-beta.0
replace k8s.io/component-helpers => ./../../kubernetes/staging/src/k8s.io/component-helpers

replace k8s.io/component-helpers => k8s.io/component-helpers v0.31.0-beta.0
replace k8s.io/controller-manager => ./../../kubernetes/staging/src/k8s.io/controller-manager

replace k8s.io/controller-manager => k8s.io/controller-manager v0.31.0-beta.0
replace k8s.io/cri-api => ./../../kubernetes/staging/src/k8s.io/cri-api

replace k8s.io/cri-api => k8s.io/cri-api v0.31.0-beta.0
replace k8s.io/csi-translation-lib => ./../../kubernetes/staging/src/k8s.io/csi-translation-lib

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0-beta.0
replace k8s.io/kube-aggregator => ./../../kubernetes/staging/src/k8s.io/kube-aggregator

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0-beta.0
replace k8s.io/kube-controller-manager => ./../../kubernetes/staging/src/k8s.io/kube-controller-manager

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0-beta.0
replace k8s.io/kube-proxy => ./../../kubernetes/staging/src/k8s.io/kube-proxy

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0-beta.0
replace k8s.io/kube-scheduler => ./../../kubernetes/staging/src/k8s.io/kube-scheduler

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0-beta.0
replace k8s.io/kubectl => ./../../kubernetes/staging/src/k8s.io/kubectl

replace k8s.io/kubectl => k8s.io/kubectl v0.31.0-beta.0
replace k8s.io/kubelet => ./../../kubernetes/staging/src/k8s.io/kubelet

replace k8s.io/kubelet => k8s.io/kubelet v0.31.0-beta.0
replace k8s.io/metrics => ./../../kubernetes/staging/src/k8s.io/metrics

replace k8s.io/metrics => k8s.io/metrics v0.31.0-beta.0
replace k8s.io/mount-utils => ./../../kubernetes/staging/src/k8s.io/mount-utils

replace k8s.io/mount-utils => k8s.io/mount-utils v0.31.0-beta.0
replace k8s.io/sample-apiserver => ./../../kubernetes/staging/src/k8s.io/sample-apiserver

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0-beta.0
replace k8s.io/sample-cli-plugin => ./../../kubernetes/staging/src/k8s.io/sample-cli-plugin

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0-beta.0
replace k8s.io/sample-controller => ./../../kubernetes/staging/src/k8s.io/sample-controller

replace k8s.io/sample-controller => k8s.io/sample-controller v0.31.0-beta.0
replace k8s.io/pod-security-admission => ./../../kubernetes/staging/src/k8s.io/pod-security-admission

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0-beta.0
replace k8s.io/dynamic-resource-allocation => ./../../kubernetes/staging/src/k8s.io/dynamic-resource-allocation

replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0-beta.0
replace k8s.io/kubernetes => ./../../kubernetes

replace k8s.io/kms => k8s.io/kms v0.31.0-beta.0
replace k8s.io/kms => ./../../kubernetes/staging/src/k8s.io/kms

replace k8s.io/endpointslice => k8s.io/endpointslice v0.31.0-beta.0
replace k8s.io/endpointslice => ./../../kubernetes/staging/src/k8s.io/endpointslice

replace k8s.io/autoscaler/cluster-autoscaler/apis => ./apis

replace k8s.io/cri-client => k8s.io/cri-client v0.31.0-beta.0
replace k8s.io/cri-client => ./../../kubernetes/staging/src/k8s.io/cri-client
Loading

0 comments on commit 1f39113

Please sign in to comment.