From 3638e4b0111acf0fa34be5ec7c41002f00416d74 Mon Sep 17 00:00:00 2001 From: Aleksandra Gacek Date: Tue, 5 Nov 2024 10:51:29 +0100 Subject: [PATCH] Update kubernetes version to 1.32.0-alpha.3. Adjust to new format of resource reuqest helpers. --- cluster-autoscaler/apis/go.mod | 8 +- cluster-autoscaler/apis/go.sum | 16 ++-- cluster-autoscaler/go.mod | 90 ++++++++++--------- cluster-autoscaler/go.sum | 90 ++++++++++--------- .../simulator/utilization/info.go | 5 +- .../simulator/utilization/info_test.go | 2 +- cluster-autoscaler/version/version.go | 2 +- 7 files changed, 107 insertions(+), 106 deletions(-) diff --git a/cluster-autoscaler/apis/go.mod b/cluster-autoscaler/apis/go.mod index 49f04da2985..b1cfd2a5e0f 100644 --- a/cluster-autoscaler/apis/go.mod +++ b/cluster-autoscaler/apis/go.mod @@ -7,9 +7,9 @@ toolchain go1.23.2 require ( github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 - k8s.io/apimachinery v0.32.0-alpha.2 - k8s.io/client-go v0.32.0-alpha.2 - k8s.io/code-generator v0.32.0-alpha.2 + k8s.io/apimachinery v0.32.0-alpha.3 + k8s.io/client-go v0.32.0-alpha.3 + k8s.io/code-generator v0.32.0-alpha.3 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 ) @@ -52,7 +52,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.32.0-alpha.2 // indirect + k8s.io/api v0.32.0-alpha.3 // indirect k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect diff --git a/cluster-autoscaler/apis/go.sum b/cluster-autoscaler/apis/go.sum index 993495f97b7..ba4acec9277 100644 --- a/cluster-autoscaler/apis/go.sum +++ b/cluster-autoscaler/apis/go.sum @@ -141,14 +141,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.0-alpha.2 h1:kGzoa28DrhUid+yqSuTTLFq+MwIdu8Qe19J+6O+zKCw= -k8s.io/api v0.32.0-alpha.2/go.mod h1:/3IPpkid+XQTMsxP04j5A4w+NnE8Ul7b0bum8frakos= -k8s.io/apimachinery v0.32.0-alpha.2 h1:ys10y0kam0MmNCBjk9cp60CclID54ojo1VSO6ejhoVg= -k8s.io/apimachinery v0.32.0-alpha.2/go.mod h1:y/FzDt/GaPgPceo5rJcCtD4qW5l8SwtbzESSMGEY6P8= -k8s.io/client-go v0.32.0-alpha.2 h1:wY8yU6Z+VmvrU8h0ugLNPTBiKk7Q1kiK9/2nsiwOb0w= -k8s.io/client-go v0.32.0-alpha.2/go.mod h1:MNu5a0Q6iCdZHZWN/raGXOf+z4YIoC1Aj6IYdvcdKSI= -k8s.io/code-generator v0.32.0-alpha.2 h1:Lfq51qYi+4dp+zxnVY10saAetRBXCO9/vP671eoUef4= -k8s.io/code-generator v0.32.0-alpha.2/go.mod h1:7Sfyz9DunkBKMIg2YRchV2dxUu1PDTw8CroP2ZvPNRw= +k8s.io/api v0.32.0-alpha.3 h1:SCix13lbG8n/cmbYeYp1vkmlS4ccgGwaq83Y7G603GY= +k8s.io/api v0.32.0-alpha.3/go.mod h1:e5tjATGvBey/pzjehc7Od+VJCiDJp0iajdkFhxvJD4I= +k8s.io/apimachinery v0.32.0-alpha.3 h1:AmhRgOkgXFBLu2prIySmIS4KLGFiZKzeMMxnPPtEhnA= +k8s.io/apimachinery v0.32.0-alpha.3/go.mod h1:y/FzDt/GaPgPceo5rJcCtD4qW5l8SwtbzESSMGEY6P8= +k8s.io/client-go v0.32.0-alpha.3 h1:+n6BNhTFmoUe1QrIOPm2q5OUI8T5yqQuHRdXdz8x2GQ= +k8s.io/client-go v0.32.0-alpha.3/go.mod h1:dJ1NeBlMJchPGs/eH9m0R7JePiMGFpRyNqo46j1vplE= +k8s.io/code-generator v0.32.0-alpha.3 h1:IukKFhLpBHfz4S+B6yPsBUpObpNb77XQ/hTSeM9ImFc= +k8s.io/code-generator v0.32.0-alpha.3/go.mod h1:41ei3GGaRZTot5P63BvGpU2N9KmOd1iLx33QSvyy/LE= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= diff --git a/cluster-autoscaler/go.mod b/cluster-autoscaler/go.mod index 4e24314421c..eae107a99be 100644 --- a/cluster-autoscaler/go.mod +++ b/cluster-autoscaler/go.mod @@ -42,19 +42,19 @@ require ( google.golang.org/protobuf v1.34.2 gopkg.in/gcfg.v1 v1.2.3 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.32.0-alpha.2 - k8s.io/apimachinery v0.32.0-alpha.2 - k8s.io/apiserver v0.32.0-alpha.2 + k8s.io/api v0.32.0-alpha.3 + k8s.io/apimachinery v0.32.0-alpha.3 + k8s.io/apiserver v0.32.0-alpha.3 k8s.io/autoscaler/cluster-autoscaler/apis v0.0.0-20240627115740-d52e4b9665d7 - k8s.io/client-go v0.32.0-alpha.2 + k8s.io/client-go v0.32.0-alpha.3 k8s.io/cloud-provider v0.30.1 k8s.io/cloud-provider-aws v1.27.0 k8s.io/cloud-provider-gcp/providers v0.28.2 - k8s.io/component-base v0.32.0-alpha.2 - k8s.io/component-helpers v0.32.0-alpha.2 + k8s.io/component-base v0.32.0-alpha.3 + k8s.io/component-helpers v0.32.0-alpha.3 k8s.io/klog/v2 v2.130.1 - k8s.io/kubelet v0.32.0-alpha.2 - k8s.io/kubernetes v1.32.0-alpha.2 + k8s.io/kubelet v0.32.0-alpha.3 + k8s.io/kubernetes v1.32.0-alpha.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/cloud-provider-azure v1.29.4 sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.13 @@ -127,6 +127,7 @@ require ( 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/btree v1.0.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 @@ -149,6 +150,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/moby/spdystream v0.5.0 // indirect github.com/moby/sys/mountinfo v0.7.2 // indirect + github.com/moby/sys/userns v0.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect @@ -172,7 +174,7 @@ 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.3.0 // indirect + github.com/vishvananda/netlink v1.3.1-0.20240905180732-b1ce50cfa9be // 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.16 // indirect @@ -207,19 +209,19 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.0.0 // indirect - k8s.io/code-generator v0.32.0-alpha.2 // indirect - k8s.io/controller-manager v0.32.0-alpha.2 // indirect - k8s.io/cri-api v0.32.0-alpha.2 // indirect + k8s.io/code-generator v0.32.0-alpha.3 // indirect + k8s.io/controller-manager v0.32.0-alpha.3 // indirect + k8s.io/cri-api v0.32.0-alpha.3 // indirect 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-20240911193312-2b36238f13e9 // indirect - k8s.io/kms v0.32.0-alpha.2 // indirect + k8s.io/kms v0.32.0-alpha.3 // 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 - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.4 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect @@ -231,64 +233,64 @@ 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.32.0-alpha.2 +replace k8s.io/api => k8s.io/api v0.32.0-alpha.3 -replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0-alpha.2 +replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0-alpha.3 -replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.0-alpha.2 +replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.0-alpha.3 -replace k8s.io/apiserver => k8s.io/apiserver v0.32.0-alpha.2 +replace k8s.io/apiserver => k8s.io/apiserver v0.32.0-alpha.3 -replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0-alpha.2 +replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0-alpha.3 -replace k8s.io/client-go => k8s.io/client-go v0.32.0-alpha.2 +replace k8s.io/client-go => k8s.io/client-go v0.32.0-alpha.3 -replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.0-alpha.2 +replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.0-alpha.3 -replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.0-alpha.2 +replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.0-alpha.3 -replace k8s.io/code-generator => k8s.io/code-generator v0.32.0-alpha.2 +replace k8s.io/code-generator => k8s.io/code-generator v0.32.0-alpha.3 -replace k8s.io/component-base => k8s.io/component-base v0.32.0-alpha.2 +replace k8s.io/component-base => k8s.io/component-base v0.32.0-alpha.3 -replace k8s.io/component-helpers => k8s.io/component-helpers v0.32.0-alpha.2 +replace k8s.io/component-helpers => k8s.io/component-helpers v0.32.0-alpha.3 -replace k8s.io/controller-manager => k8s.io/controller-manager v0.32.0-alpha.2 +replace k8s.io/controller-manager => k8s.io/controller-manager v0.32.0-alpha.3 -replace k8s.io/cri-api => k8s.io/cri-api v0.32.0-alpha.2 +replace k8s.io/cri-api => k8s.io/cri-api v0.32.0-alpha.3 -replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.0-alpha.2 +replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.0-alpha.3 -replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.0-alpha.2 +replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.0-alpha.3 -replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.0-alpha.2 +replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.0-alpha.3 -replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.0-alpha.2 +replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.0-alpha.3 -replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.0-alpha.2 +replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.0-alpha.3 -replace k8s.io/kubectl => k8s.io/kubectl v0.32.0-alpha.2 +replace k8s.io/kubectl => k8s.io/kubectl v0.32.0-alpha.3 -replace k8s.io/kubelet => k8s.io/kubelet v0.32.0-alpha.2 +replace k8s.io/kubelet => k8s.io/kubelet v0.32.0-alpha.3 -replace k8s.io/metrics => k8s.io/metrics v0.32.0-alpha.2 +replace k8s.io/metrics => k8s.io/metrics v0.32.0-alpha.3 -replace k8s.io/mount-utils => k8s.io/mount-utils v0.32.0-alpha.2 +replace k8s.io/mount-utils => k8s.io/mount-utils v0.32.0-alpha.3 -replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0-alpha.2 +replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0-alpha.3 -replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.0-alpha.2 +replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.0-alpha.3 -replace k8s.io/sample-controller => k8s.io/sample-controller v0.32.0-alpha.2 +replace k8s.io/sample-controller => k8s.io/sample-controller v0.32.0-alpha.3 -replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.0-alpha.2 +replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.0-alpha.3 -replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.0-alpha.2 +replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.0-alpha.3 -replace k8s.io/kms => k8s.io/kms v0.32.0-alpha.2 +replace k8s.io/kms => k8s.io/kms v0.32.0-alpha.3 -replace k8s.io/endpointslice => k8s.io/endpointslice v0.32.0-alpha.2 +replace k8s.io/endpointslice => k8s.io/endpointslice v0.32.0-alpha.3 replace k8s.io/autoscaler/cluster-autoscaler/apis => ./apis -replace k8s.io/cri-client => k8s.io/cri-client v0.32.0-alpha.2 +replace k8s.io/cri-client => k8s.io/cri-client v0.32.0-alpha.3 diff --git a/cluster-autoscaler/go.sum b/cluster-autoscaler/go.sum index a4a2e010fbd..055b1d642c8 100644 --- a/cluster-autoscaler/go.sum +++ b/cluster-autoscaler/go.sum @@ -315,6 +315,8 @@ github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= +github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= +github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -392,8 +394,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/vburenin/ifacemaker v1.2.1 h1:3Vq8B/bfBgjWTkv+jDg4dVL1KHt3k1K4lO7XRxYA2sk= github.com/vburenin/ifacemaker v1.2.1/go.mod h1:5WqrzX2aD7/hi+okBjcaEQJMg4lDGrpuEX3B8L4Wgrs= -github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= -github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= +github.com/vishvananda/netlink v1.3.1-0.20240905180732-b1ce50cfa9be h1:xdCMvyhnKzaepIUgVpUmTJo/+H1AQ7HuFYn1hv7/Neo= +github.com/vishvananda/netlink v1.3.1-0.20240905180732-b1ce50cfa9be/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= @@ -623,60 +625,60 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.32.0-alpha.2 h1:kGzoa28DrhUid+yqSuTTLFq+MwIdu8Qe19J+6O+zKCw= -k8s.io/api v0.32.0-alpha.2/go.mod h1:/3IPpkid+XQTMsxP04j5A4w+NnE8Ul7b0bum8frakos= -k8s.io/apiextensions-apiserver v0.32.0-alpha.2 h1:tkHJfDxyeDYbMg8NW4nC2NF1A2+++fMEekOUwjHhN+Y= -k8s.io/apiextensions-apiserver v0.32.0-alpha.2/go.mod h1:39C3Wxb6dROvSY993c7h8Y1efvDJYRZ3VEzlzV4ZcjY= -k8s.io/apimachinery v0.32.0-alpha.2 h1:ys10y0kam0MmNCBjk9cp60CclID54ojo1VSO6ejhoVg= -k8s.io/apimachinery v0.32.0-alpha.2/go.mod h1:y/FzDt/GaPgPceo5rJcCtD4qW5l8SwtbzESSMGEY6P8= -k8s.io/apiserver v0.32.0-alpha.2 h1:AGcXfJUFq+GLryG15pAa2PH8egMBbdh8rgBjTlTD1Ls= -k8s.io/apiserver v0.32.0-alpha.2/go.mod h1:WUqEgUO0gc7U/uMaaypYOCj14Nzdb641WCK+ysEw/0M= -k8s.io/client-go v0.32.0-alpha.2 h1:wY8yU6Z+VmvrU8h0ugLNPTBiKk7Q1kiK9/2nsiwOb0w= -k8s.io/client-go v0.32.0-alpha.2/go.mod h1:MNu5a0Q6iCdZHZWN/raGXOf+z4YIoC1Aj6IYdvcdKSI= -k8s.io/cloud-provider v0.32.0-alpha.2 h1:jGIfqf1vzLeBEAMQar9oGYf47CFXo7zz1Ck+QFBptC0= -k8s.io/cloud-provider v0.32.0-alpha.2/go.mod h1:7TrUYV0ZO8VR57QU+fK/7SWmhj8b7rYhffDs4oo02ZI= +k8s.io/api v0.32.0-alpha.3 h1:SCix13lbG8n/cmbYeYp1vkmlS4ccgGwaq83Y7G603GY= +k8s.io/api v0.32.0-alpha.3/go.mod h1:e5tjATGvBey/pzjehc7Od+VJCiDJp0iajdkFhxvJD4I= +k8s.io/apiextensions-apiserver v0.32.0-alpha.3 h1:YBq+nre6iNF0IeTrXO4OFbZ1GOq/LNYtYyr73eAAvKw= +k8s.io/apiextensions-apiserver v0.32.0-alpha.3/go.mod h1:xezfZTAbAtz8ny+17KsDciPSAapg08GNwTHYsD9JCvE= +k8s.io/apimachinery v0.32.0-alpha.3 h1:AmhRgOkgXFBLu2prIySmIS4KLGFiZKzeMMxnPPtEhnA= +k8s.io/apimachinery v0.32.0-alpha.3/go.mod h1:y/FzDt/GaPgPceo5rJcCtD4qW5l8SwtbzESSMGEY6P8= +k8s.io/apiserver v0.32.0-alpha.3 h1:FJ3NbaL4hsGS19WMncuRr/JcLSVf7u4V61o7DVJ5Aj4= +k8s.io/apiserver v0.32.0-alpha.3/go.mod h1:8jSFI9UaPqfAeCxjNWjGwCyTp/Iiir8gCXOXTuchMiA= +k8s.io/client-go v0.32.0-alpha.3 h1:+n6BNhTFmoUe1QrIOPm2q5OUI8T5yqQuHRdXdz8x2GQ= +k8s.io/client-go v0.32.0-alpha.3/go.mod h1:dJ1NeBlMJchPGs/eH9m0R7JePiMGFpRyNqo46j1vplE= +k8s.io/cloud-provider v0.32.0-alpha.3 h1:HXKyj4+auTsKPAoI+LqZYD5m6FHvbASZwp/4jwfLyJc= +k8s.io/cloud-provider v0.32.0-alpha.3/go.mod h1:A3nFgiLeL1342YY5K2hMJjURREOA3GZIT3EcUi6SvTQ= k8s.io/cloud-provider-aws v1.27.0 h1:PF8YrH8QcN6JoXB3Xxlaz84SBDYMPunJuCc0cPuCWXA= k8s.io/cloud-provider-aws v1.27.0/go.mod h1:9vUb5mnVnReSRDBWcBxB1b0HOeEc472iOPmrnwpN9SA= k8s.io/cloud-provider-gcp/providers v0.28.2 h1:I65pFTLNMQSj7YuW3Mg3pZIXmw0naCmF6TGAuz4/sZE= k8s.io/cloud-provider-gcp/providers v0.28.2/go.mod h1:P8dxRvvLtX7xUwVUzA/QOqv8taCzBaVsVMnjnpjmYXE= -k8s.io/code-generator v0.32.0-alpha.2 h1:Lfq51qYi+4dp+zxnVY10saAetRBXCO9/vP671eoUef4= -k8s.io/code-generator v0.32.0-alpha.2/go.mod h1:7Sfyz9DunkBKMIg2YRchV2dxUu1PDTw8CroP2ZvPNRw= -k8s.io/component-base v0.32.0-alpha.2 h1:Sq8cWVmvPwrNGDYhIkhjc65sGwYFkhhIQKdVjZR4V44= -k8s.io/component-base v0.32.0-alpha.2/go.mod h1:YPyM2sUsjiC2hmV/3zR5lOLD5xvZ8fW2HOXzWQzuUXg= -k8s.io/component-helpers v0.32.0-alpha.2 h1:7s0oH8ZXV7xHYth13hiJnVT0L8urcBmDIgHT3t6cFaA= -k8s.io/component-helpers v0.32.0-alpha.2/go.mod h1:+oRBxHDrLMbFKcyVPzdlX06vR6lmDUxw0C9UuQMEz8o= -k8s.io/controller-manager v0.32.0-alpha.2 h1:0EPsjlQJrugAzTwDy/59beDLMJW540BmJmnxOdxg8yg= -k8s.io/controller-manager v0.32.0-alpha.2/go.mod h1:iLHDoARWR2yaGd34CWjGZHlCmJ4W7WDVjRJ9BRroVGE= -k8s.io/cri-api v0.32.0-alpha.2 h1:v0oCOuahvb0xu7v7RPlspMFxNoxtKJmb+ZZ+jBYfepw= -k8s.io/cri-api v0.32.0-alpha.2/go.mod h1:ca9lKDUa9PmUGVDSSetDQqgf0dyk/NW8u+MpJo7JaYA= -k8s.io/cri-client v0.32.0-alpha.2 h1:9f8g3gXievJ1bf/4jMYXewiajYdp3H43qmlju3jQXds= -k8s.io/cri-client v0.32.0-alpha.2/go.mod h1:6PRK870n855ve79qCVxBM6SF1unkcICOmKqIP7dDO7k= -k8s.io/csi-translation-lib v0.32.0-alpha.2 h1:aDmBoZHTLDQFe+tg6aW6200h3zHpPNG/Um3LQZ+G1F8= -k8s.io/csi-translation-lib v0.32.0-alpha.2/go.mod h1:ofNQFLE49ifYG/GK24sL32PauoAMSu2iOhqKELtS6Bs= -k8s.io/dynamic-resource-allocation v0.32.0-alpha.2 h1:z57yDu6wx6/G7VyL3oqPXwQTd3V/DU91KTFo465eV34= -k8s.io/dynamic-resource-allocation v0.32.0-alpha.2/go.mod h1:zkGKaL4jgppBLesLNtybtLUQDSIMyGYyqfnBdmHaDk4= +k8s.io/code-generator v0.32.0-alpha.3 h1:IukKFhLpBHfz4S+B6yPsBUpObpNb77XQ/hTSeM9ImFc= +k8s.io/code-generator v0.32.0-alpha.3/go.mod h1:41ei3GGaRZTot5P63BvGpU2N9KmOd1iLx33QSvyy/LE= +k8s.io/component-base v0.32.0-alpha.3 h1:8V9eDGTJhSNZO3QJIVNW8lc6CEls3UeQ5Wlup6E42Oc= +k8s.io/component-base v0.32.0-alpha.3/go.mod h1:Vi4/eGNdpRRd3BRYvFK3cTOkwnYw8+Zn7qrH/9stC3Q= +k8s.io/component-helpers v0.32.0-alpha.3 h1:3VnAqMLemvbAK9lG9RKJkBLWIuJqpkdAGpY0vPlXxPs= +k8s.io/component-helpers v0.32.0-alpha.3/go.mod h1:hszISsdqPvs0DFscuQQ8AWO4i4+naUqJhHosawozG4M= +k8s.io/controller-manager v0.32.0-alpha.3 h1:BfCGwuw7DFnvO5ITHWcuDt15Fs1hgkpgv8hGo0UM6bo= +k8s.io/controller-manager v0.32.0-alpha.3/go.mod h1:pNd1mjmcG4ndvVYOeQ+l1M8T9gQj7AVwFseOXqpW5pU= +k8s.io/cri-api v0.32.0-alpha.3 h1:OUAlaVOWLeEavxfSz4csuTUoh18NLL428MfErm3X8+w= +k8s.io/cri-api v0.32.0-alpha.3/go.mod h1:ca9lKDUa9PmUGVDSSetDQqgf0dyk/NW8u+MpJo7JaYA= +k8s.io/cri-client v0.32.0-alpha.3 h1:SvFASmtGh/sJwqWq0zcz6x70fGwY/3Bek8Nx+aYVw2Y= +k8s.io/cri-client v0.32.0-alpha.3/go.mod h1:INJQJPXH40fSblgYNqkmW4VIkVD31FzC5xTyVppSWsk= +k8s.io/csi-translation-lib v0.32.0-alpha.3 h1:tE5wRXuGIkzddYIcQdA/SP7vCzFgp6auxX9VE9g9iU4= +k8s.io/csi-translation-lib v0.32.0-alpha.3/go.mod h1:1P87jnoG3bwX4B5cnGb6+U1oX5pkp5LVBbOZJB57fiE= +k8s.io/dynamic-resource-allocation v0.32.0-alpha.3 h1:92/6RBMT5nBDX1DZMBRp3sMpq18dWZQItGQZck2etA8= +k8s.io/dynamic-resource-allocation v0.32.0-alpha.3/go.mod h1:k0pPzUjZxhrM55HAVv90I+shOLeB7Fs/CH2bHGYCa+4= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.0-alpha.2 h1:NJN4JwERThH1UVDE8XSEXrBf4Zi8nPFpuiF3rWCjYU4= -k8s.io/kms v0.32.0-alpha.2/go.mod h1:9jVVb5kg1PXT6I5QMPUTqnr6P9Tg+6H5Y7hCML+P0k0= +k8s.io/kms v0.32.0-alpha.3 h1:xiFFCvKlUtvJcro8CQKT5Vc476O17jusCEW81K7IpLA= +k8s.io/kms v0.32.0-alpha.3/go.mod h1:9jVVb5kg1PXT6I5QMPUTqnr6P9Tg+6H5Y7hCML+P0k0= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= -k8s.io/kube-scheduler v0.32.0-alpha.2 h1:3EWYqipPl/8Jgvan+ZOw4e+t8kRxm9HbpZn7sUjF+KQ= -k8s.io/kube-scheduler v0.32.0-alpha.2/go.mod h1:cTI39hJm/j57voACiVy6hvJUYWSHmU8IKHj0KXVyvnU= -k8s.io/kubectl v0.32.0-alpha.2 h1:ORj13guFN6eaGb5S0MR+XisA4feAfFkJWdD7o9bB+XA= -k8s.io/kubectl v0.32.0-alpha.2/go.mod h1:97Da6nCRG5+NpmeI65kQXln/MdeZPNN71EQfRDtlIWY= -k8s.io/kubelet v0.32.0-alpha.2 h1:CYQgjxjEoI2uuRV8thQxbhRg63YZWvmtXzLbikRXV3s= -k8s.io/kubelet v0.32.0-alpha.2/go.mod h1:MG+qkvs/5r8LJo9JIjK0VIprGl9e5Se3w/Hcxz3F6co= -k8s.io/kubernetes v1.32.0-alpha.2 h1:mhRCLaD3dW/q/YK4gPK/0kq6RNE9Y8kJYtotNM8fFmM= -k8s.io/kubernetes v1.32.0-alpha.2/go.mod h1:TAaDswjW/pbx/Ymn+Tu9IqBmJ0/cTauicHZfYq5x9G4= -k8s.io/mount-utils v0.32.0-alpha.2 h1:a4rrRVJ3PBCTU/ZZw7P7um6mxEE9wBiLeTv6DhJlfn4= -k8s.io/mount-utils v0.32.0-alpha.2/go.mod h1:1a8XOdEzKk0WaoGiuBo07STrozzYEFcQFuAugtlp9iQ= +k8s.io/kube-scheduler v0.32.0-alpha.3 h1:ud6Tz5u6mxvhq4C5yqKWU57R41UMFNE+Dd63ejsNf90= +k8s.io/kube-scheduler v0.32.0-alpha.3/go.mod h1:uRk+Th/ND4AJz97y7m/vVYuCMES9l/tZv1ToMd52Q9k= +k8s.io/kubectl v0.32.0-alpha.3 h1:4N/7FkNwkw2VOQRSLOm7PjpJqEMPbuzpAlhUyisxbA4= +k8s.io/kubectl v0.32.0-alpha.3/go.mod h1:alzmRd9FafXyfcdV3MWtLjemXrNgBp3O5kBX/Z1Xa/Y= +k8s.io/kubelet v0.32.0-alpha.3 h1:Ipl/u8+frS6vOcxKQKP/mRY7jYFPCat2Z/w/zzxlUwM= +k8s.io/kubelet v0.32.0-alpha.3/go.mod h1:CNko3NUxlXQFjLdvdGLHl4Fs5hxf/inb09lOCXcwDlU= +k8s.io/kubernetes v1.32.0-alpha.3 h1:ELCmam/w95S6xdycce+oe5fuckctXZsDHP0G4guWg0U= +k8s.io/kubernetes v1.32.0-alpha.3/go.mod h1:ZY3GQi3AJ4u1wTzJhp7+0mILTa6wvd6ngQg5mIdWCxI= +k8s.io/mount-utils v0.32.0-alpha.3 h1:hAcLw/2y2oI5HJNhTYLl5oIJDtO0A+aAwHuAR0z/AwA= +k8s.io/mount-utils v0.32.0-alpha.3/go.mod h1:khrY8UHSXERsBfl6uIkhVWIsEuYIlc5hzGmu0lI9GRE= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/cloud-provider-azure v1.29.4 h1:lW/mqq9fofs52/T+Crs6JNzzEhz0NjzQUtSXMseh67M= sigs.k8s.io/cloud-provider-azure v1.29.4/go.mod h1:73KgMVXVtMqG/JlhRRezonfirvoO2ldsxC6H+1FKEPg= sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.13 h1:dxpo41/N6m2R//9fmqKgqYZL2k0rQSE1NvQteIQ9pGA= diff --git a/cluster-autoscaler/simulator/utilization/info.go b/cluster-autoscaler/simulator/utilization/info.go index 54365bf8471..dab779b72d4 100644 --- a/cluster-autoscaler/simulator/utilization/info.go +++ b/cluster-autoscaler/simulator/utilization/info.go @@ -91,16 +91,13 @@ func CalculateUtilizationOfResource(nodeInfo *schedulerframework.NodeInfo, resou return 0, fmt.Errorf("%v is 0 at %s", resourceName, nodeInfo.Node().Name) } - opts := resourcehelper.PodResourcesOptions{} - // if skipDaemonSetPods = True, DaemonSet pods resourses will be subtracted // from the node allocatable and won't be added to pods requests // the same with the Mirror pod. podsRequest := resource.MustParse("0") daemonSetAndMirrorPodsUtilization := resource.MustParse("0") for _, podInfo := range nodeInfo.Pods { - requestedResourceList := resourcehelper.PodRequests(podInfo.Pod, opts) - resourceValue := requestedResourceList[resourceName] + resourceValue := resourcehelper.GetResourceRequestQuantity(podInfo.Pod, resourceName) // factor daemonset pods out of the utilization calculations if skipDaemonSetPods && pod_util.IsDaemonSetPod(podInfo.Pod) { diff --git a/cluster-autoscaler/simulator/utilization/info_test.go b/cluster-autoscaler/simulator/utilization/info_test.go index d68e92f2b88..3cd4ea9016c 100644 --- a/cluster-autoscaler/simulator/utilization/info_test.go +++ b/cluster-autoscaler/simulator/utilization/info_test.go @@ -97,7 +97,7 @@ func TestCalculate(t *testing.T) { utilInfo, err = Calculate(nodeInfo, false, false, gpuConfig, testTime) assert.NoError(t, err) assert.InEpsilon(t, 50.25, utilInfo.Utilization, 0.01) - assert.Equal(t, 25.125, utilInfo.CpuUtil) + assert.InEpsilon(t, 25.125, utilInfo.CpuUtil, 0.005) daemonSetPod3 := BuildTestPod("p3", 100, 200000) daemonSetPod3.OwnerReferences = GenerateOwnerReferences("ds", "DaemonSet", "apps/v1", "") diff --git a/cluster-autoscaler/version/version.go b/cluster-autoscaler/version/version.go index 56c47141b24..356510e3a3c 100644 --- a/cluster-autoscaler/version/version.go +++ b/cluster-autoscaler/version/version.go @@ -17,4 +17,4 @@ limitations under the License. package version // ClusterAutoscalerVersion contains version of CA. -const ClusterAutoscalerVersion = "1.32.0-alpha.2" +const ClusterAutoscalerVersion = "1.32.0-alpha.3"