Add timeout

Signed-off-by: Omer Aplatony <[email protected]>
kubernetes · Dec 4, 2024 · 86da7a5 · 86da7a5
1 parent e492f4d
commit 86da7a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,6 +9,8 @@ env:
 
 permissions:
   contents: read
+  checks: write
+  pull-requests: read
 
 jobs:
   test-and-verify:
@@ -38,21 +40,24 @@ jobs:
         env:
           GO111MODULE: auto
 
-      - name: golangci-lint
+      - name: golangci-lint - balancer
         uses: golangci/golangci-lint-action@v6
         with:
+          args: --timeout=30m
           working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler/balancer
           version: v1.60
 
-      - name: golangci-lint
+      - name: golangci-lint - cluster-autoscaler
         uses: golangci/golangci-lint-action@v6
         with:
+          args: --timeout=30m
           working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler/cluster-autoscaler
           version: v1.60
 
-      - name: golangci-lint
+      - name: golangci-lint - vertical-pod-autoscaler
         uses: golangci/golangci-lint-action@v6
         with:
+          args: --timeout=30m
           working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler/vertical-pod-autoscaler
           version: v1.60
 

diff --git a/vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go b/vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go
@@ -193,9 +193,9 @@ func (calc *UpdatePriorityCalculator) GetProcessedRecommendationTargets(r *vpa_t
 	return sb.String()
 }
 
-func parseVpaObservedContainers(pod *apiv1.Pod) (bool, sets.String) {
+func parseVpaObservedContainers(pod *apiv1.Pod) (bool, sets.Set[string]) {
 	observedContainers, hasObservedContainers := pod.GetAnnotations()[annotations.VpaObservedContainersLabel]
-	vpaContainerSet := sets.NewString()
+	vpaContainerSet := sets.New[string]()
 	if hasObservedContainers {
 		if containers, err := annotations.ParseVpaObservedContainersValue(observedContainers); err != nil {
 			klog.ErrorS(err, "VPA annotation failed to parse", "pod", klog.KObj(pod), "annotation", observedContainers)