Merge pull request #662 from slok/slok/k8s-v134

Update deps and add support for go 1.25 and k8s 1.34

Author: slok

.github/workflows/ci.yaml

@@ -7,9 +7,9 @@ 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
+      - uses: actions/checkout@v5
       - run: |
           # We need this go flag because it started to error after golangci-lint is using Go 1.21.
           # TODO(slok): Remove it on next (>1.54.1) golangci-lint upgrade to check if this problem has gone.
@@ -20,8 +20,8 @@ jobs:
     name: Unit test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
       - run: make ci-test
@@ -35,13 +35,13 @@ jobs:
     name: Helm chart test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           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..."
@@ -52,8 +52,8 @@ jobs:
     name: Integration test CLI
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
       - name: Execute tests
@@ -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
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         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..."
@@ -124,7 +124,7 @@ jobs:
     name: Release images
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Docker login
         run: docker login ghcr.io -u ${{ github.actor }} -p "${{ secrets.GITHUB_TOKEN }}"
       - name: Build and publish docker images
@@ -147,7 +147,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "VERSION=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV} # Sets VERSION env var.
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Docker login
         run: docker login ghcr.io -u ${{ github.actor }} -p "${{ secrets.GITHUB_TOKEN }}"
       - name: Build and publish docker images
@@ -168,7 +168,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "VERSION=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV} # Sets VERSION env var.
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build binaries
         run: |
           mkdir -p ./bin

.github/workflows/close-stale.yaml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           days-before-stale: 60
           days-before-close: 15

.github/workflows/generate.yaml

@@ -11,7 +11,7 @@ jobs:
     name: Generate the SLOs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: download and setup generator binary
         run: |
           wget https://github.com/slok/sloth/releases/download/v0.9.0/sloth-linux-amd64

.github/workflows/helmrelease.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.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

CHANGELOG.md

@@ -10,7 +10,8 @@
 - (BREAKING) `--sli-plugins-path`, `--slo-plugins-path`, `-m` args and it's env vars `SLOTH_SLI_PLUGINS_PATH`and  `SLOTH_SLO_PLUGINS_PATH` have been removed in favor or `--plugins-path`, `-p` and it's env var `SLOTH_PLUGINS_PATH` that discovers and loads SLI and SLO plugins with a single flag.
 - Simplify validation and improve validation message by using custom logic instead of `go-playground/validator`.
 - (BREAKING) `--disable-optimized-rules` flag and associated env var  has been removed.
-- Update to Kubernetes v1.33.
+- Update to Kubernetes v1.34.
+- Update to Go v1.25.
 
 ### Added
 

README.md

@@ -8,7 +8,7 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/slok/sloth)](https://goreportcard.com/report/github.com/slok/sloth)
 [![Apache 2 licensed](https://img.shields.io/badge/license-Apache2-blue.svg)](https://raw.githubusercontent.com/slok/sloth/master/LICENSE)
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/slok/sloth)](https://github.com/slok/sloth/releases/latest)
-![Kubernetes release](https://img.shields.io/badge/Kubernetes-v1.33-green?logo=Kubernetes&style=flat&color=326CE5&logoColor=white)
+![Kubernetes release](https://img.shields.io/badge/Kubernetes-v1.34-green?logo=Kubernetes&style=flat&color=326CE5&logoColor=white)
 [![OpenSLO](https://img.shields.io/badge/OpenSLO-v1alpha-green?color=4974EA&style=flat)](https://github.com/OpenSLO/OpenSLO#slo)
 
 ## Project status

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,22 +162,22 @@ 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)
 				if openSLOErr == nil {
 					err := gen.GenerateOpenSLO(ctx, *slos, io.Discard)
 					if err != nil {
-						validation.Errs = []error{fmt.Errorf("Could not generate OpenSLO format rules: %w", err)}
+						validation.Errs = []error{fmt.Errorf("could not generate OpenSLO format rules: %w", err)}
 					}
 					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"