Upgrade to cortex v1.21.0

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

Author: friedrichg

.github/workflows/integration_test.yml

@@ -14,13 +14,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24
+          go-version: 1.25
       - name: Start Cortex
         run: |
           docker run -d --name cortex \
             -p 9009:9009 \
             -v ${{ github.workspace }}/integration/cortex-config.yaml:/etc/cortex/config.yaml \
-            cortexproject/cortex:v1.20.1 \
+            cortexproject/cortex:v1.21.0 \
             -config.file=/etc/cortex/config.yaml \
             -target=all,alertmanager
       - name: Wait for Cortex

.github/workflows/validate_pr.yml

@@ -14,20 +14,20 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24
+          go-version: 1.25
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.64
+          version: v2.11.4
   unit_tests:
     name: Unit-Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24
+          go-version: 1.25
       - name: Unit Tests
         run: make test
   build:
@@ -37,6 +37,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24
+          go-version: 1.25
       - name: Build All
         run: make all

.golangci.yml

@@ -1,24 +1,44 @@
+version: "2"
 run:
-  timeout: 10m
-  modules-download-mode: vendor
   build-tags:
     - netgo
     - require_docker
-
+  modules-download-mode: vendor
 output:
   formats:
-    - format: line-number
-
+    text:
+      path: stdout
+      colors: false
 linters:
   enable:
-    - goimports
-    - revive
     - misspell
+    - revive
+  settings:
+    errcheck:
+      exclude-functions:
+        - (github.com/go-kit/log.Logger).Log
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
     - gofmt
-
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - (github.com/go-kit/log.Logger).Log
-  goimports:
-    local-prefixes: "github.com/cortexproject/cortex-tools"
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/cortexproject/cortex-tools
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

go.mod

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/rulefmt"
 	"github.com/prometheus/prometheus/promql/parser"
 	log "github.com/sirupsen/logrus"
@@ -234,7 +235,7 @@ func (r RuleNamespace) Validate() []error {
 func ValidateRuleGroup(g rwrulefmt.RuleGroup) []error {
 	var errs []error
 	for _, r := range g.Rules {
-		for _, we := range r.Validate(rulefmt.RuleNode{}) {
+		for _, we := range r.Validate(rulefmt.RuleNode{}, model.LegacyValidation) {
 			errs = append(errs, fmt.Errorf("group %q, rule %q: %s", g.Name, getRuleName(r), we.Error()))
 		}
 	}