Update deps and add support for go 1.25 and k8s 1.34

Signed-off-by: Xabier Larrakoetxea <me@slok.dev>

Author: slok

.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ jobs:
     name: Check
     runs-on: ubuntu-latest
     # Execute the checks inside the container instead the VM.
-    container: golangci/golangci-lint:v1.64.8-alpine
+    container: golangci/golangci-lint:v2.4.0-alpine
     steps:
       - uses: actions/checkout@v4
       - run: |
@@ -41,7 +41,7 @@ jobs:
           go-version-file: go.mod
       - name: Execute tests
         env:
-          HELM_VERSION: v3.6.3
+          HELM_VERSION: v3.17.0
         run: |
           # Get dependencies.
           echo "Getting dependencies..."
@@ -72,15 +72,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        kubernetes: [1.30.13, 1.31.9, 1.32.5, 1.33.1]
+        kubernetes: [1.31.12, 1.32.8, 1.33.4, 1.34.0]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
       - name: Execute tests
         env:
-          KIND_VERSION: v0.28.0
+          KIND_VERSION: v0.30.0
         run: |
           # Get dependencies.
           echo "Getting dependencies..."

.golangci.yml

@@ -1,21 +1,30 @@
----
+version: "2"
 run:
-  timeout: 3m
   build-tags:
     - integration
-
 linters:
   enable:
+    - godot
     - misspell
-    - goimports
     - revive
+  settings:
+    revive:
+      rules:
+        # Spammy linter and complex to fix on lots of parameters. Makes more harm that it solves.
+        - name: unused-parameter
+          disabled: true
+    staticcheck:
+      checks:
+        - all
+        # Omit embedded fields from selector expression.
+        # https://staticcheck.dev/docs/checks/#QF1008
+        - -QF1008
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - std-error-handling
+formatters:
+  enable:
     - gofmt
-    #- depguard
-    - godot
-
-linters-settings:
-  revive:
-    rules:
-      # Spammy linter and complex to fix on lots of parameters. Makes more harm that it solves.
-      - name: unused-parameter
-        disabled: true
+    - goimports

cmd/sloth/commands/helpers.go

@@ -133,8 +133,8 @@ func mapCmdPluginToModel(ctx context.Context, jsonPlugins []string) ([]model.Pro
 }
 
 func createDefaultSLOPlugins(logger log.Logger, disableRecordings, disableAlerts bool) ([]generate.SLOProcessor, error) {
-	var sliRuleGen generate.SLOProcessor = generate.NoopPlugin
-	var metaRuleGen generate.SLOProcessor = generate.NoopPlugin
+	sliRuleGen := generate.NoopPlugin
+	metaRuleGen := generate.NoopPlugin
 	if !disableRecordings {
 		sliPlugin, err := generate.NewSLOProcessorFromSLOPluginV1(
 			plugincoreslirulesv1.NewPlugin,
@@ -167,7 +167,7 @@ func createDefaultSLOPlugins(logger log.Logger, disableRecordings, disableAlerts
 	}
 
 	// Disable alert rules if required.
-	var alertRuleGen generate.SLOProcessor = generate.NoopPlugin
+	alertRuleGen := generate.NoopPlugin
 	if !disableAlerts {
 		plugin, err := generate.NewSLOProcessorFromSLOPluginV1(
 			plugincorealertrulesv1.NewPlugin,

cmd/sloth/commands/validate.go

@@ -145,12 +145,12 @@ func (v validateCommand) Run(ctx context.Context, config RootConfig) error {
 				if promErr == nil {
 					err := gen.GeneratePrometheus(ctx, *slos, io.Discard)
 					if err != nil {
-						validation.Errs = []error{fmt.Errorf("Could not generate Prometheus format rules: %w", err)}
+						validation.Errs = []error{fmt.Errorf("could not generate Prometheus format rules: %w", err)}
 					}
 					continue
 				}
 
-				validation.Errs = []error{fmt.Errorf("Tried loading raw prometheus SLOs spec, it couldn't: %w", promErr)}
+				validation.Errs = []error{fmt.Errorf("tried loading raw prometheus SLOs spec, it couldn't: %w", promErr)}
 
 			case kubeYAMLLoader.IsSpecType(ctx, dataB):
 				sloGroup, k8sErr := kubeYAMLLoader.LoadSpec(ctx, dataB)
@@ -162,7 +162,7 @@ func (v validateCommand) Run(ctx context.Context, config RootConfig) error {
 					continue
 				}
 
-				validation.Errs = []error{fmt.Errorf("Tried loading Kubernetes prometheus SLOs spec, it couldn't: %w", k8sErr)}
+				validation.Errs = []error{fmt.Errorf("tried loading Kubernetes prometheus SLOs spec, it couldn't: %w", k8sErr)}
 
 			case openSLOYAMLLoader.IsSpecType(ctx, dataB):
 				slos, openSLOErr := openSLOYAMLLoader.LoadSpec(ctx, dataB)
@@ -174,10 +174,10 @@ func (v validateCommand) Run(ctx context.Context, config RootConfig) error {
 					continue
 				}
 
-				validation.Errs = []error{fmt.Errorf("Tried loading OpenSLO SLOs spec, it couldn't: %s", openSLOErr)}
+				validation.Errs = []error{fmt.Errorf("tried loading OpenSLO SLOs spec, it couldn't: %s", openSLOErr)}
 
 			default:
-				validation.Errs = []error{fmt.Errorf("Unknown spec type")}
+				validation.Errs = []error{fmt.Errorf("unknown spec type")}
 			}
 		}
 

docker/dev/Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.24
+FROM golang:1.25
 
 LABEL org.opencontainers.image.source=https://github.com/slok/sloth
 
-ARG GOLANGCI_LINT_VERSION="1.64.8"
-ARG MOCKERY_VERSION="3.1.0"
+ARG GOLANGCI_LINT_VERSION="2.4.0"
+ARG MOCKERY_VERSION="3.5.4"
 ARG GOMARKDOC_VERSION="1.1.0"
 ARG HELM_VERSION="3.17.0"
 ARG YAEGI_VERSION="0.16.1"

docker/prod/Dockerfile

@@ -1,7 +1,7 @@
 # Set also `ARCH` ARG here so we can use it on all the `FROM`s. 
 ARG ARCH
 
-FROM golang:1.24.4-alpine as build-stage
+FROM golang:1.25-alpine as build-stage
 
 LABEL org.opencontainers.image.source=https://github.com/slok/sloth
 

examples/_gen/k8s-getting-started.yml

@@ -6,7 +6,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  creationTimestamp: null
   labels:
     app.kubernetes.io/component: SLO
     app.kubernetes.io/managed-by: sloth

examples/_gen/k8s-home-wifi.yml

@@ -6,7 +6,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  creationTimestamp: null
   labels:
     app: sloth
     app.kubernetes.io/component: SLO

examples/_gen/k8s-multifile.yml

@@ -6,7 +6,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  creationTimestamp: null
   labels:
     app.kubernetes.io/component: SLO
     app.kubernetes.io/managed-by: sloth
@@ -265,7 +264,6 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  creationTimestamp: null
   labels:
     app.kubernetes.io/component: SLO
     app.kubernetes.io/managed-by: sloth

examples/_gen/plugin-k8s-getting-started.yml

@@ -6,7 +6,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  creationTimestamp: null
   labels:
     app: sloth
     app.kubernetes.io/component: SLO