Skip to content

Commit 73e4369

Browse files
committed
fix: bump golangci-lint timeout to 10m
1 parent 842e6c5 commit 73e4369

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ lint: ## Verifies `golangci-lint` passes
6565
lint-ci: ## Verifies `golangci-lint` passes and outputs in CI-friendly format
6666
@echo "==> $@"
6767
@golangci-lint version
68-
@golangci-lint run ./... --out-format code-climate > golangci-lint.json
68+
@golangci-lint run ./... --timeout=10m --out-format code-climate > golangci-lint.json
6969

7070
.PHONY: build
7171
build: ## Builds the executable and places it in the build dir

Diff for: internal/node/node_lifecycle_controller.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,11 @@ func (c *CloudNodeLifecycleController) getProviderID(ctx context.Context, node *
230230
func (c *CloudNodeLifecycleController) shutdownInCloudProvider(ctx context.Context, node *v1.Node) (bool, error) {
231231
if instanceV2, ok := c.cloud.InstancesV2(); ok {
232232
shutDown, err := instanceV2.InstanceShutdown(ctx, node)
233+
if err != nil {
234+
return shutDown, fmt.Errorf("failed to get instance shutdown status: %w", err)
235+
}
233236

234-
return shutDown, fmt.Errorf("failed to get instance shutdown status: %w", err)
237+
return shutDown, nil
235238
}
236239

237240
instances, ok := c.cloud.Instances()
@@ -264,8 +267,11 @@ func (c *CloudNodeLifecycleController) shutdownInCloudProvider(ctx context.Conte
264267
func (c *CloudNodeLifecycleController) ensureNodeExistsByProviderID(ctx context.Context, node *v1.Node) (bool, error) {
265268
if instanceV2, ok := c.cloud.InstancesV2(); ok {
266269
exists, err := instanceV2.InstanceExists(ctx, node)
270+
if err != nil {
271+
return exists, fmt.Errorf("failed to get instance existence: %w", err)
272+
}
267273

268-
return exists, fmt.Errorf("failed to get instance existence: %w", err)
274+
return exists, nil
269275
}
270276

271277
instances, ok := c.cloud.Instances()

0 commit comments

Comments
 (0)