From 26d39a6beea7c0921069e53f512bdf962bb26545 Mon Sep 17 00:00:00 2001 From: Sergey Melnikov Date: Tue, 5 Nov 2024 20:07:48 +0100 Subject: [PATCH] cluster-autoscaler: Upgrade to 1.28.6 (#1097) --------- Co-authored-by: Anton Chaporgin Co-authored-by: Michael Francis Co-authored-by: Michael Francis --- cluster-autoscaler/ca.patch | 14 +++++++------- cluster-autoscaler/ca.tag | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster-autoscaler/ca.patch b/cluster-autoscaler/ca.patch index 9b9b49772..3d132f7c3 100644 --- a/cluster-autoscaler/ca.patch +++ b/cluster-autoscaler/ca.patch @@ -1,5 +1,5 @@ diff --git a/cluster-autoscaler/utils/kubernetes/listers.go b/cluster-autoscaler/utils/kubernetes/listers.go -index d0033550f..fa3c2ec30 100644 +index 198fdfb37..d534fc1ef 100644 --- a/cluster-autoscaler/utils/kubernetes/listers.go +++ b/cluster-autoscaler/utils/kubernetes/listers.go @@ -17,14 +17,19 @@ limitations under the License. @@ -22,23 +22,23 @@ index d0033550f..fa3c2ec30 100644 client "k8s.io/client-go/kubernetes" v1appslister "k8s.io/client-go/listers/apps/v1" v1batchlister "k8s.io/client-go/listers/batch/v1" -@@ -185,6 +190,7 @@ func NewUnschedulablePodInNamespaceLister(kubeClient client.Interface, namespace - selector := fields.ParseSelectorOrDie("spec.nodeName==" + "" + ",status.phase!=" + +@@ -169,6 +174,7 @@ func NewScheduledPodLister(kubeClient client.Interface, stopchannel <-chan struc + selector := fields.ParseSelectorOrDie("spec.nodeName!=" + "" + ",status.phase!=" + string(apiv1.PodSucceeded) + ",status.phase!=" + string(apiv1.PodFailed)) - podListWatch := cache.NewListWatchFromClient(kubeClient.CoreV1().RESTClient(), "pods", namespace, selector) + podListWatch := cache.NewListWatchFromClient(kubeClient.CoreV1().RESTClient(), "pods", apiv1.NamespaceAll, selector) + podListWatch = wrapListWatchWithNeonVMUsage(podListWatch) store, reflector := cache.NewNamespaceKeyedIndexerAndReflector(podListWatch, &apiv1.Pod{}, time.Hour) podLister := v1lister.NewPodLister(store) go reflector.Run(stopchannel) -@@ -209,6 +215,7 @@ func NewScheduledPodLister(kubeClient client.Interface, stopchannel <-chan struc - selector := fields.ParseSelectorOrDie("spec.nodeName!=" + "" + ",status.phase!=" + +@@ -212,6 +218,7 @@ func NewScheduledAndUnschedulablePodLister(kubeClient client.Interface, stopchan + selector := fields.ParseSelectorOrDie("status.phase!=" + string(apiv1.PodSucceeded) + ",status.phase!=" + string(apiv1.PodFailed)) podListWatch := cache.NewListWatchFromClient(kubeClient.CoreV1().RESTClient(), "pods", apiv1.NamespaceAll, selector) + podListWatch = wrapListWatchWithNeonVMUsage(podListWatch) store, reflector := cache.NewNamespaceKeyedIndexerAndReflector(podListWatch, &apiv1.Pod{}, time.Hour) podLister := v1lister.NewPodLister(store) go reflector.Run(stopchannel) -@@ -218,6 +225,105 @@ func NewScheduledPodLister(kubeClient client.Interface, stopchannel <-chan struc +@@ -221,6 +228,105 @@ func NewScheduledAndUnschedulablePodLister(kubeClient client.Interface, stopchan } } diff --git a/cluster-autoscaler/ca.tag b/cluster-autoscaler/ca.tag index 2f0c5a797..111e04650 100644 --- a/cluster-autoscaler/ca.tag +++ b/cluster-autoscaler/ca.tag @@ -1 +1 @@ -cluster-autoscaler-1.27.8 +cluster-autoscaler-1.28.6