Merge branch 'main' into xcap-traces

Author: ashwanthgoli

.dockerignore

@@ -1,2 +1,3 @@
 production/docker/.data
 .cache
+tools/dev/kafka/data

.github/release-workflows.jsonnet

@@ -195,6 +195,26 @@ local weeklyImageJobs = {
           ||| % { name: '%s-image' % name }),
         ])
       for name in std.objectFields(weeklyImageJobs)
+    } + {
+      'trigger-cd': job.new()
+                    + job.withNeeds(['loki-image', 'loki-manifest', 'loki-canary-manifest'])
+                    + job.withIf("github.ref == 'refs/heads/main'")
+                    + job.withPermissions({
+                      contents: 'read',
+                      'id-token': 'write',
+                    })
+                    + job.withEnv({
+                      IMAGE_TAG: '${{ needs.loki-image.outputs.image_tag }}',
+                    })
+                    + job.withSteps([
+                      step.new('Trigger CD workflow', 'grafana/shared-workflows/actions/trigger-argo-workflow@8b88213bca76e86f9f59b43038cc5d7545452436')  // main
+                      + step.with({
+                        instance: 'ops',
+                        namespace: 'loki-cd',
+                        workflow_template: 'loki-continuous-deployment',
+                        parameters: 'imageTag=${{ env.IMAGE_TAG }}',
+                      }),
+                    ]),
     },
   }),
 }

.github/workflows/helm-ci.yml

@@ -36,9 +36,9 @@ jobs:
           persist-credentials: false
 
       - name: Set up Helm
-        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4
+        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
         with:
-          version: v3.8.2
+          version: v3.18.6
 
       # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
       # yamllint (https://github.com/adrienverge/yamllint) which require Python
@@ -135,7 +135,9 @@ jobs:
           persist-credentials: 'false'
 
       - name: Set up Helm
-        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112  # v4.3.0
+        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
+        with:
+          version: v3.18.6
 
       - name: Install Flux CLI
         uses: fluxcd/flux2/action@6bf37f6a560fd84982d67f853162e4b3c2235edb  # v2.6.4

.github/workflows/images.yml

@@ -503,6 +503,26 @@
           ${OUTPUTS_IMAGE_NAME}@${IMAGE_DIGEST_AMD64} \
           ${OUTPUTS_IMAGE_NAME}@${IMAGE_DIGEST_ARM}
         docker buildx imagetools inspect $IMAGE
+  "trigger-cd":
+    "env":
+      "IMAGE_TAG": "${{ needs.loki-image.outputs.image_tag }}"
+    "if": "github.ref == 'refs/heads/main'"
+    "needs":
+    - "loki-image"
+    - "loki-manifest"
+    - "loki-canary-manifest"
+    "permissions":
+      "contents": "read"
+      "id-token": "write"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "name": "Trigger CD workflow"
+      "uses": "grafana/shared-workflows/actions/trigger-argo-workflow@8b88213bca76e86f9f59b43038cc5d7545452436"
+      "with":
+        "instance": "ops"
+        "namespace": "loki-cd"
+        "parameters": "imageTag=${{ env.IMAGE_TAG }}"
+        "workflow_template": "loki-continuous-deployment"
 "name": "Publish images"
 "on":
   "push":

.github/workflows/logql-correctness.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.24.9"
+          go-version: "1.25.4"
 
       # The metastore generates invalid filenames for Windows (with colons),
       # which get rejected by upload-artifact. We zip these files to avoid this
@@ -51,14 +51,15 @@ jobs:
           retention-days: 7
 
   tests:
-    name: Run correctness tests for ${{ matrix.store }}
+    name: Run ${{ matrix.store }}/${{ matrix.range_type }}/${{ matrix.remote_transport == true && 'remote' || 'local' }}
     runs-on: github-hosted-ubuntu-arm64-large
     needs: generate-testdata
     timeout-minutes: 60
     strategy:
       matrix:
         store: [dataobj-engine]
         range_type: [instant, range]
+        remote_transport: [true, false]
       fail-fast: false # Continue testing other stores if one fails
     steps:
       - name: Checkout code
@@ -80,7 +81,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.24.9"
+          go-version: "1.25.4"
 
       - name: Create results directory
         run: mkdir -p ./pkg/logql/bench/results
@@ -89,7 +90,7 @@ jobs:
         shell: bash # Use bash shell to propagate pipe failures
         run: |
           go test \
-            -v -slow-tests -timeout=60m \
+            -v -slow-tests -remote-transport=${{ matrix.remote_transport }} -timeout=60m \
             -run=TestStorageEquality/query=.+/kind=.+/store=${{ matrix.store }}$ \
             ${{ matrix.range_type == 'instant' && '-range-type=instant' || '' }} \
             ${{ inputs.failfast == true && '-failfast' || '' }} \
@@ -100,6 +101,6 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always() # Upload results even if one of the test tests fails
         with:
-          name: logql-bench-results-${{ matrix.store }}-${{ matrix.range_type }}-${{ steps.checkout.outputs.commit }}
+          name: logql-bench-results-${{ matrix.store }}-${{ matrix.range_type }}-${{ matrix.remote_transport == true && 'remote' || 'local' }}-${{ steps.checkout.outputs.commit }}
           path: ./pkg/logql/bench/results
           retention-days: 7

.github/workflows/querytee-images.yml

@@ -75,7 +75,7 @@ jobs:
             IMAGE_TAG=${{ steps.pr-version.outputs.image_version }}
             GO_VERSION=${{ env.GO_VERSION }}
           context: .
-          file: ./cmd/querytee/Dockerfile.cross
+          file: ./cmd/querytee/Dockerfile
           outputs: push-by-digest=true,type=image,name=${{ steps.pr-version.outputs.image_name }},push=true
           platforms: ${{ matrix.arch }}
           provenance: true