From 395549a270444dcc305ecf51840d369a0253eec4 Mon Sep 17 00:00:00 2001 From: Benjamin Pineau Date: Thu, 6 Jun 2024 17:12:18 -0400 Subject: [PATCH 1/2] [local] Fix CI for master-1.12 branch That branch (and really, cluster-autoscaler-1.28.x) won't pass CI anymore as its `GO111MODULE=auto` will break with golang >= 1.21, yet the CI specified `'>=1.20.0'`, so it broke when a newer version of `actions/setup-go` was provided. --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index aff975642a72..5fdc44f9f26b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '>=1.20.0' + go-version: '1.20.14' - uses: actions/checkout@v2 with: From a65087861df7a599d97e0689f77cc6cb18d96223 Mon Sep 17 00:00:00 2001 From: Benjamin Pineau Date: Thu, 6 Jun 2024 17:29:38 -0400 Subject: [PATCH 2/2] [local] fix gofmt issue in our local branch --- cluster-autoscaler/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-autoscaler/main.go b/cluster-autoscaler/main.go index b7bc3aeb8e48..285a6af58c97 100644 --- a/cluster-autoscaler/main.go +++ b/cluster-autoscaler/main.go @@ -325,7 +325,7 @@ func createAutoscalingOptions() config.AutoscalingOptions { GpuTotal: parsedGpuTotal, NodeGroups: *nodeGroupsFlag, EnforceNodeGroupMinSize: *enforceNodeGroupMinSize, - NodeInfosProcessorPodTemplates: *podTemplatesProcessor, + NodeInfosProcessorPodTemplates: *podTemplatesProcessor, ScaleDownDelayAfterAdd: *scaleDownDelayAfterAdd, ScaleDownDelayAfterDelete: *scaleDownDelayAfterDelete, ScaleDownDelayAfterFailure: *scaleDownDelayAfterFailure,