From f7a6a60e5b8135daf728a4a4605e003b59880336 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 3 Feb 2022 16:39:03 -0800 Subject: [PATCH] bump k8s deps to 1.22.6 - vendor k8s 1.22.6 - GetNonzeroRequestForResource -> GetRequestForResource (k/k~106081) - Adapt to options.NewOptions() (k/k~105915) --- cmd/scheduler/main_test.go | 11 +-- go.mod | 72 +++++++-------- go.sum | 111 ++++++++++++----------- pkg/noderesources/resource_allocation.go | 4 +- 4 files changed, 97 insertions(+), 101 deletions(-) diff --git a/cmd/scheduler/main_test.go b/cmd/scheduler/main_test.go index b4f1ebfed..0e7e79423 100644 --- a/cmd/scheduler/main_test.go +++ b/cmd/scheduler/main_test.go @@ -597,12 +597,9 @@ profiles: for _, tc := range testcases { t.Run(tc.name, func(t *testing.T) { fs := pflag.NewFlagSet("test", pflag.PanicOnError) - opts, err := options.NewOptions() - if err != nil { - t.Fatal(err) - } + opts := options.NewOptions() - nfs := opts.Flags() + nfs := opts.Flags for _, f := range nfs.FlagSets { fs.AddFlagSet(f) } @@ -610,10 +607,6 @@ profiles: t.Fatal(err) } - if err := opts.Complete(&nfs); err != nil { - t.Fatal(err) - } - // use listeners instead of static ports so parallel test runs don't conflict opts.SecureServing.Listener = makeListener(t) defer opts.SecureServing.Listener.Close() diff --git a/go.mod b/go.mod index 9299c90f8..ccde27ffd 100644 --- a/go.mod +++ b/go.mod @@ -11,49 +11,49 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 gonum.org/v1/gonum v0.6.2 - k8s.io/api v0.22.3 + k8s.io/api v0.22.6 k8s.io/apiextensions-apiserver v0.0.0 - k8s.io/apimachinery v0.22.3 - k8s.io/apiserver v0.22.3 - k8s.io/client-go v0.22.3 - k8s.io/code-generator v0.22.3 - k8s.io/component-base v0.22.3 - k8s.io/component-helpers v0.22.3 + k8s.io/apimachinery v0.22.6 + k8s.io/apiserver v0.22.6 + k8s.io/client-go v0.22.6 + k8s.io/code-generator v0.22.6 + k8s.io/component-base v0.22.6 + k8s.io/component-helpers v0.22.6 k8s.io/klog/hack/tools v0.0.0-20210917071902-331d2323a192 k8s.io/klog/v2 v2.9.0 k8s.io/kube-aggregator v0.0.0 - k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e - k8s.io/kube-scheduler v0.22.3 - k8s.io/kubernetes v1.22.3 + k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c + k8s.io/kube-scheduler v0.22.6 + k8s.io/kubernetes v1.22.6 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.22.3 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.3 - k8s.io/apimachinery => k8s.io/apimachinery v0.22.3 - k8s.io/apiserver => k8s.io/apiserver v0.22.3 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.3 - k8s.io/client-go => k8s.io/client-go v0.22.3 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.3 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.3 - k8s.io/code-generator => k8s.io/code-generator v0.22.3 - k8s.io/component-base => k8s.io/component-base v0.22.3 - k8s.io/component-helpers => k8s.io/component-helpers v0.22.3 - k8s.io/controller-manager => k8s.io/controller-manager v0.22.3 - k8s.io/cri-api => k8s.io/cri-api v0.22.3 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.3 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.3 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.3 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.3 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.3 - k8s.io/kubectl => k8s.io/kubectl v0.22.3 - k8s.io/kubelet => k8s.io/kubelet v0.22.3 - k8s.io/kubernetes => k8s.io/kubernetes v1.22.3 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.3 - k8s.io/metrics => k8s.io/metrics v0.22.3 - k8s.io/mount-utils => k8s.io/mount-utils v0.22.3 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.3 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.3 + k8s.io/api => k8s.io/api v0.22.6 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.6 + k8s.io/apimachinery => k8s.io/apimachinery v0.22.6 + k8s.io/apiserver => k8s.io/apiserver v0.22.6 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.6 + k8s.io/client-go => k8s.io/client-go v0.22.6 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.6 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.6 + k8s.io/code-generator => k8s.io/code-generator v0.22.6 + k8s.io/component-base => k8s.io/component-base v0.22.6 + k8s.io/component-helpers => k8s.io/component-helpers v0.22.6 + k8s.io/controller-manager => k8s.io/controller-manager v0.22.6 + k8s.io/cri-api => k8s.io/cri-api v0.22.6 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.6 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.6 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.6 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.6 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.6 + k8s.io/kubectl => k8s.io/kubectl v0.22.6 + k8s.io/kubelet => k8s.io/kubelet v0.22.6 + k8s.io/kubernetes => k8s.io/kubernetes v1.22.6 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.6 + k8s.io/metrics => k8s.io/metrics v0.22.6 + k8s.io/mount-utils => k8s.io/mount-utils v0.22.6 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.6 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.6 ) diff --git a/go.sum b/go.sum index 1734a5a75..cea0958aa 100644 --- a/go.sum +++ b/go.sum @@ -100,6 +100,7 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= @@ -291,7 +292,7 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cadvisor v0.39.2/go.mod h1:kN93gpdevu+bpS227TyHVZyCU5bbqCzTj5T9drl34MI= +github.com/google/cadvisor v0.39.3/go.mod h1:kN93gpdevu+bpS227TyHVZyCU5bbqCzTj5T9drl34MI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -501,6 +502,7 @@ github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04s github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= +github.com/opencontainers/selinux v1.8.2 h1:c4ca10UMgRcvZ6h0K4HtS15UaVSBEaE+iln2LVpAuGc= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= @@ -815,8 +817,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1111,31 +1113,31 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.22.3 h1:wOoES2GoSkUsdped2RB4zYypPqWtvprGoKCENTOOjP4= -k8s.io/api v0.22.3/go.mod h1:azgiXFiXqiWyLCfI62/eYBOu19rj2LKmIhFPP4+33fs= -k8s.io/apiextensions-apiserver v0.22.3 h1:bKku7MqawIbtTZc084BZoMV4fz0WZuvCnB5E+yrQXGM= -k8s.io/apiextensions-apiserver v0.22.3/go.mod h1:f4plF+CXeqI89jAXL0Ml4LI/kSAZ54JS94+XOX1sae8= -k8s.io/apimachinery v0.22.3 h1:mrvBG5CZnEfwgpVqWcrRKvdsYECTrhAR6cApAgdsflk= -k8s.io/apimachinery v0.22.3/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apiserver v0.22.3 h1:x21xyLQ2qvPr5vjOTVOBaSJu8svnU2wfLOfSjNJEOdw= -k8s.io/apiserver v0.22.3/go.mod h1:oam7lH/F1Kto/WTamyQYrD68fS0mGUBORAFf6x/9Mxs= -k8s.io/cli-runtime v0.22.3/go.mod h1:um6JvCxV9Hrhq0zCUxcqYoY7/wF64g6IYgOViI8sg6Q= -k8s.io/client-go v0.22.3 h1:6onkOSc+YNdwq5zXE0wFXicq64rrym+mXwHu/CPVGO4= -k8s.io/client-go v0.22.3/go.mod h1:ElDjYf8gvZsKDYexmsmnMQ0DYO8W9RwBjfQ1PI53yow= -k8s.io/cloud-provider v0.22.3 h1:ZsWdB0WmyjKlE901EM14BuSvnN+QPGrCGjcfDc+b5NI= -k8s.io/cloud-provider v0.22.3/go.mod h1:GsKMR5EnNH4zcfkEvOxBPEZVuRvadVRkZvGqYxxBvO4= -k8s.io/cluster-bootstrap v0.22.3 h1:uTrzquwoXsstQ6PCea0dYbKWcPCetMp4MZEkZbT+Ei0= -k8s.io/cluster-bootstrap v0.22.3/go.mod h1:FVBAeGJ/T6QbNgGb7DX98FCjExJnNLsRXtGRMjEQ26I= -k8s.io/code-generator v0.22.3 h1:24xLuKySzFl1XupMarNBkpt10q0N+73R9dF7wzJO/hE= -k8s.io/code-generator v0.22.3/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= -k8s.io/component-base v0.22.3 h1:/+hryAW03u3FpJQww+GSMsArJNUbGjH66lrgxaRynLU= -k8s.io/component-base v0.22.3/go.mod h1:kuybv1miLCMoOk3ebrqF93GbQHQx6W2287FC0YEQY6s= -k8s.io/component-helpers v0.22.3 h1:08tn+T8HnjRTwDP2ErIBhHGvPcYJf5zWaWW83golHWc= -k8s.io/component-helpers v0.22.3/go.mod h1:7OVySVH5elhHKuJKUOxZEfpT1Bm3ChmBQZHmuFfbGHk= -k8s.io/controller-manager v0.22.3/go.mod h1:4cvQGMvYf6IpTY08/NigEiI5UrN/cbtOe5e5WepYmcQ= -k8s.io/cri-api v0.22.3/go.mod h1:mj5DGUtElRyErU5AZ8EM0ahxbElYsaLAMTPhLPQ40Eg= -k8s.io/csi-translation-lib v0.22.3 h1:Tg8SNNsCn3oIm4rkXBj0+lt12scRbntiTBMo8AGn0Tg= -k8s.io/csi-translation-lib v0.22.3/go.mod h1:YkdI+scWhZJQeA26iNg9XrKO3LhLz6dAcRKsL0RIiUY= +k8s.io/api v0.22.6 h1:acjE5ABt0KpsBI9QCtLqaQEPSF94jOtE/LoFxSYasSE= +k8s.io/api v0.22.6/go.mod h1:q1F7IfaNrbi/83ebLy3YFQYLjPSNyunZ/IXQxMmbwCg= +k8s.io/apiextensions-apiserver v0.22.6 h1:TH+9+EGtoVzzbrlfSDnObzFTnyXKqw1NBfT5XFATeJI= +k8s.io/apiextensions-apiserver v0.22.6/go.mod h1:wNsLwy8mfIkGThiv4Qq/Hy4qRazViKXqmH5pfYiRKyY= +k8s.io/apimachinery v0.22.6 h1:z7vxNRkFX0NToA+8D17kzLZ/T4t+DqwzUlqqbqRepRs= +k8s.io/apimachinery v0.22.6/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU= +k8s.io/apiserver v0.22.6 h1:5MXAa5zBEd7dvCmaqrYV5GohA5jvNAmJX3Hy78JAGDY= +k8s.io/apiserver v0.22.6/go.mod h1:OlL1rGa2kKWGj2JEXnwBcul/BwC9Twe95gm4ohtiIIs= +k8s.io/cli-runtime v0.22.6/go.mod h1:UY6oHyBUZ/y0O6ovyyPy++S5LdijxJSOizXsrAP+qKU= +k8s.io/client-go v0.22.6 h1:ugAXeC312xeGXsn7zTRz+btgtLBnW3qYhtUUpVQL7YE= +k8s.io/client-go v0.22.6/go.mod h1:TffU4AV2idZGeP+g3kdFZP+oHVHWPL1JYFySOALriw0= +k8s.io/cloud-provider v0.22.6 h1:KGKfTVdw7xCWn+SztgsloO2/wUbVlcjj/+xYaFIYFYk= +k8s.io/cloud-provider v0.22.6/go.mod h1:qKWDzOCIsSWlPvC4txa9X+IuxeJX8LWf9jz/ClpBIPQ= +k8s.io/cluster-bootstrap v0.22.6 h1:Jm1MDTPSxHRQp9m4jT44fVv9S2BiEivZ+R8JjEEdTdQ= +k8s.io/cluster-bootstrap v0.22.6/go.mod h1:G8vRWaBElK/3fk3UsnqFKO4Sr8LyX6urLqdkuPXOC8k= +k8s.io/code-generator v0.22.6 h1:nskDbd+etRmWhB/WoaevaFIJfL+lDt5HI7wAIvA4CcQ= +k8s.io/code-generator v0.22.6/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU= +k8s.io/component-base v0.22.6 h1:YgGMDVnr97rhn0eljuYIU/9XFyz8JVDM30slMYrDgPc= +k8s.io/component-base v0.22.6/go.mod h1:ngHLefY4J5fq2fApNdbWyj4yh0lvw36do4aAjNN8rc8= +k8s.io/component-helpers v0.22.6 h1:0ReyVoTv1AVz2aZyxdTSkdN3YawEJfEEJZ2Uuol1s8w= +k8s.io/component-helpers v0.22.6/go.mod h1:C2jlCvarTU8hnT493tS17t3rjk51c8nang8L1D9lQ5Q= +k8s.io/controller-manager v0.22.6/go.mod h1:yklwmkmk51pUYyo8URpFer7R07wcvVq/xNRUN36oDDs= +k8s.io/cri-api v0.22.6/go.mod h1:uAw9CICQq20/1yB4ZnWT2TjJyMMROl4typFfWaURLwQ= +k8s.io/csi-translation-lib v0.22.6 h1:Zn/3KKlMRlz6NO8mcVBuNHJBUAjLSTC7KrPsRl8Mtgc= +k8s.io/csi-translation-lib v0.22.6/go.mod h1:/O6a26XNs3xsiAZeHUF75dDQt8dyT53c5C8JBSryLTQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -1145,29 +1147,30 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-aggregator v0.22.3 h1:a+QucblaDv4zLgDE0ttLEUSk/SO/6xi3XZESmFri/D0= -k8s.io/kube-aggregator v0.22.3/go.mod h1:TIpLq1HvR/S4y75i3y+4q9ik3ZvgyaDz72CBfDS0A6E= -k8s.io/kube-controller-manager v0.22.3/go.mod h1:7biFk6Azf7xD+pzTScw7X9M5vGScqYp4J4wOT61QL1s= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= +k8s.io/kube-aggregator v0.22.6 h1:/iaXzOWia2dqOQkIA9eJtkmfTveJMLz3Dci9ZA/WgmU= +k8s.io/kube-aggregator v0.22.6/go.mod h1:0RSTzxqiwsj5HUlov195Z72ZKyE4qgedKXCl6sLKAjM= +k8s.io/kube-controller-manager v0.22.6/go.mod h1:RkYKr813YbQhuOBK+12gikPvK/AXy80qovB6YmHfzW8= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-proxy v0.22.3/go.mod h1:9ta1U8GKKo6by981sN/L6MhFJzPWxMdfh7plVPH1I2s= -k8s.io/kube-scheduler v0.22.3 h1:VDd3zuXPUNTT1WSt/s+1Pk4lnfBNcVdfoijHv0MnV/4= -k8s.io/kube-scheduler v0.22.3/go.mod h1:jVLHSttd8cSejBLOeiWE+g8etA6XdOBGiR8tI577OhU= -k8s.io/kubectl v0.22.3 h1:xziSHHyFHg2nt9vE6A0XqW5dOePNSlzxG8z3z+IY63E= -k8s.io/kubectl v0.22.3/go.mod h1:gcpQHPOx+Jke9Og6Li7YxR/ZuaOtFUeJw7xHH617tHs= -k8s.io/kubelet v0.22.3 h1:C21Kg66Zzvc21uJITEPg4stGMcSZsR1JB+7+6Uwm8zs= -k8s.io/kubelet v0.22.3/go.mod h1:9nUZNGUigU2uAIm7kgf8BsvYDI9KjIE5nt9+yI1+p7w= -k8s.io/kubernetes v1.22.3 h1:/eFfR5S2Vxn0t9kcLVAZXQFloKMkklWQIf5e0hFbzlA= -k8s.io/kubernetes v1.22.3/go.mod h1:Snea7fgIObGgHmLbUJ3OgjGEr5bjj16iEdp5oHS6eS8= -k8s.io/legacy-cloud-providers v0.22.3 h1:74V7g6rAdzaK7L3iZabqmlCZ7P+ZzYOXe5VHIsD7qT8= -k8s.io/legacy-cloud-providers v0.22.3/go.mod h1:eEOOaRtP2PuCVkjZvuTPa6ZgyPpzJkCVqpE3YtuArLQ= -k8s.io/metrics v0.22.3 h1:G4EGLIcm9CSlpLRXKjIJiZqM/l45xasz2BOiK4qJCNo= -k8s.io/metrics v0.22.3/go.mod h1:HbLFLRKtXzoC/6tHLQAlO9AeOBXZp2eB6SsgkbujoNI= -k8s.io/mount-utils v0.22.3 h1:3BIJ5lgA4qIhQ2/YhpCs9VMDP+/CiBGKZ8N+zeHFCWE= -k8s.io/mount-utils v0.22.3/go.mod h1:dHl6c2P60T5LHUnZxVslyly9EDCMzvhtISO5aY+Z4sk= -k8s.io/pod-security-admission v0.22.3 h1:E8tKEseoDFPAiNKfsKm94ovP7aUeQ9Q0GNqZScL/Jro= -k8s.io/pod-security-admission v0.22.3/go.mod h1:xtkf/UhVWICokQLSDvD+8plfGkTQW4VTJvnixVWCeWk= -k8s.io/sample-apiserver v0.22.3/go.mod h1:HuEOdD/pT5R7gKNr2REb62uabZaJuFZyY3wUd86nFCA= +k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80= +k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +k8s.io/kube-proxy v0.22.6/go.mod h1:xLxEZ3sHyz11XaRyxqI4Z4F3I/Wtt+Jlep8w5yxQPAY= +k8s.io/kube-scheduler v0.22.6 h1:Ei9deaOE7n5mTg5k5OFNz8vjIbMLKd3PCxs9cv4tx0A= +k8s.io/kube-scheduler v0.22.6/go.mod h1:DcHj6ixvb0M1PvWFbg133a1pz/vv7OSCgZUDU/UUhlU= +k8s.io/kubectl v0.22.6 h1:xUvvVuKpo1d2Pur7BtSEdf2wWhO5HuwYJSlpCP4pIJY= +k8s.io/kubectl v0.22.6/go.mod h1:9ktAgMwUsd2w12Yhj/xhMZhNna1t9rfExJg9j9jCIYk= +k8s.io/kubelet v0.22.6 h1:RYr3K4CANyAOi51dNUZg0fa6aXgHDADITwKEhlsa78s= +k8s.io/kubelet v0.22.6/go.mod h1:/nSfVw7oYzpmLn8Ua2q2Zix09Fq5gpDGnNqTbab9wts= +k8s.io/kubernetes v1.22.6 h1:OPKNO4FElcN6wHc3N3P6uW3P1oHvzNxu+HJ8vGQtBzM= +k8s.io/kubernetes v1.22.6/go.mod h1:l2ikQCpfvsMAXgL7FDtzgn/AVdjt4XGUYHMXn2vuzYI= +k8s.io/legacy-cloud-providers v0.22.6 h1:2fnvYlnsBBOV40OX9CFXGjCVQ17iEd5PXedD5IvGBjM= +k8s.io/legacy-cloud-providers v0.22.6/go.mod h1:ZhqLzcCCT4mGgxzVXJNg9/zQDBE8S2isa053fzXSR1s= +k8s.io/metrics v0.22.6 h1:IuhXd94j+yJKCss3bek2afPQzQl+ixz24HT5JhgTu7w= +k8s.io/metrics v0.22.6/go.mod h1:4a2o3y5qe2CleeMWZ80VCKzz+N8vPboAw/pz3xKQicI= +k8s.io/mount-utils v0.22.6 h1:17tVt9R3p6MOfSJCglteP5KrXOnlXUIbYv1J7mquJV8= +k8s.io/mount-utils v0.22.6/go.mod h1:dHl6c2P60T5LHUnZxVslyly9EDCMzvhtISO5aY+Z4sk= +k8s.io/pod-security-admission v0.22.6 h1:yFbJZpoKNztuTdO8DyH7fdGuELxrbhoFMvmzDMhAmyI= +k8s.io/pod-security-admission v0.22.6/go.mod h1:aBlsoKgqpuixDMaCu7U4d8IywNzcmGAKi7/fmfr840M= +k8s.io/sample-apiserver v0.22.6/go.mod h1:wiamO3alvd/dicaP8PvTPCdqq31QKDbRxm1uqOGalsI= k8s.io/system-validators v1.5.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g= @@ -1181,15 +1184,15 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 h1:fmRfl9WJ4ApJn7LxNuED4m0t18qivVQOxP6aAYG9J6c= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 h1:KQOkVzXrLNb0EP6W0FD6u3CCPAwgXFYwZitbj7K0P0Y= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g= sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs= sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod h1:MOkR6fmhwG7hEDRXBYELTi5GSFcLwfqwzTRHW3kv5go= sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= diff --git a/pkg/noderesources/resource_allocation.go b/pkg/noderesources/resource_allocation.go index 18c078561..bcaa43628 100644 --- a/pkg/noderesources/resource_allocation.go +++ b/pkg/noderesources/resource_allocation.go @@ -107,13 +107,13 @@ func calculatePodResourceRequest(pod *v1.Pod, resource v1.ResourceName) int64 { var podRequest int64 for i := range pod.Spec.Containers { container := &pod.Spec.Containers[i] - value := schedutil.GetNonzeroRequestForResource(resource, &container.Resources.Requests) + value := schedutil.GetRequestForResource(resource, &container.Resources.Requests, true) podRequest += value } for i := range pod.Spec.InitContainers { initContainer := &pod.Spec.InitContainers[i] - value := schedutil.GetNonzeroRequestForResource(resource, &initContainer.Resources.Requests) + value := schedutil.GetRequestForResource(resource, &initContainer.Resources.Requests, true) if podRequest < value { podRequest = value }