diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index db574c1..16955b9 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -13,7 +13,7 @@ on: - "*" env: - GOLANG_VERSION: "^1.17.6" + GOLANG_VERSION: "^1.18.2" jobs: doc: @@ -52,9 +52,9 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@v2 with: - version: v1.42 + version: v1.46.2 github-token: ${{ secrets.GITHUB_TOKEN }} - args: "--fix=false" + args: "--fix=false --timeout=10m" tidy: name: Mod tidy diff --git a/go.mod b/go.mod index 3a8c4c8..73a8664 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dodopizza/kubectl-shovel -go 1.17 +go 1.18 require ( github.com/google/uuid v1.2.0 diff --git a/internal/kubernetes/jobs.go b/internal/kubernetes/jobs.go index 2085edf..3650c32 100644 --- a/internal/kubernetes/jobs.go +++ b/internal/kubernetes/jobs.go @@ -106,10 +106,10 @@ func (j *JobRunSpec) Build(namespace string) *batch.Job { }, ObjectMeta: metaSpec, Spec: batch.JobSpec{ - Parallelism: int32Ptr(1), - Completions: int32Ptr(1), - TTLSecondsAfterFinished: int32Ptr(5), - BackoffLimit: int32Ptr(0), + Parallelism: ptr(int32(1)), + Completions: ptr(int32(1)), + TTLSecondsAfterFinished: ptr(int32(5)), + BackoffLimit: ptr(int32(0)), Template: core.PodTemplateSpec{ ObjectMeta: metaSpec, Spec: core.PodSpec{ @@ -183,7 +183,7 @@ func (j *JobRunSpec) securityContext() *core.SecurityContext { Capabilities: &core.Capabilities{ Add: []core.Capability{"SYS_PTRACE"}, }, - Privileged: boolPtr(true), + Privileged: ptr(true), } } @@ -212,10 +212,6 @@ func (k *Client) DeleteJob(name string) error { Delete(context.Background(), name, options) } -func int32Ptr(i int32) *int32 { - return &i -} - -func boolPtr(b bool) *bool { - return &b +func ptr[T any](t T) *T { + return &t }