Merge branch 'main' into chunkv5

grafana · Nov 22, 2024 · 42f33d8 · 42f33d8
2 parents a72455a + b406015
commit 42f33d8
Show file tree

Hide file tree

Showing 938 changed files with 71,322 additions and 38,954 deletions.
diff --git a/.github/workflows/helm-ci.yml b/.github/workflows/helm-ci.yml
@@ -11,35 +11,9 @@ env:
 
 jobs:
   call-lint:
-    name: Lint Helm Chart
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Check Docs
-        run: |
-          docker run --rm --volume "$(pwd):/helm-docs" -u "$(id -u)" jnorwood/helm-docs:v1.11.0
-          if ! git diff --exit-code; then
-              echo "Documentation not up to date. Please run helm-docs and commit changes!" >&2
-              exit 1
-          fi
-
-      - name: Lint Yaml
-        run: make helm-lint
-
-      - name: Lint Code Base
-        uses: docker://github/super-linter:v3.17.2
-        env:
-          FILTER_REGEX_EXCLUDE: .*(CHANGELOG\.md|README\.md|Chart\.yaml|NOTES.txt).*
-          FILTER_REGEX_INCLUDE: .*production/helm/.*
-          VALIDATE_ALL_CODEBASE: false
-          VALIDATE_KUBERNETES_KUBEVAL: false
-          VALIDATE_YAML: false
-          VALIDATE_GO: false
-          DEFAULT_BRANCH: main
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          LOG_LEVEL: DEBUG
+    uses: grafana/helm-charts/.github/workflows/linter.yml@main
+    with:
+      filter_regex_include: .*production/helm/loki/.*
   call-test:
     name: Test Helm Chart
     runs-on: ubuntu-latest

diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   call-update-helm-repo:
-    uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@main
+    uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@70dbbb722dee3f2ee126e12684cc0e92a20972ed
     with:
       charts_dir: production/helm
       cr_configfile: production/helm/cr.yaml

diff --git a/.github/workflows/helm-tagged-release-pr.yaml b/.github/workflows/helm-tagged-release-pr.yaml
@@ -33,7 +33,7 @@ jobs:
           bash .github/workflows/scripts/helm-tagged-release.sh ${RELEASE_VERSION}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.get_github_app_token.outputs.token }}
           title: "chore: release loki helm chart ${{ steps.update.outputs.new_chart_version }}"

diff --git a/.github/workflows/helm-weekly-release-pr.yaml b/.github/workflows/helm-weekly-release-pr.yaml
@@ -41,7 +41,7 @@ jobs:
           bash .github/workflows/scripts/helm-weekly-release.sh -k
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.get_github_app_token.outputs.token }}
           title: "chore: release loki helm chart ${{ steps.update-k.outputs.new_chart_version }}"
@@ -57,7 +57,7 @@ jobs:
           bash .github/workflows/scripts/helm-weekly-release.sh
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.get_github_app_token.outputs.token }}
           title: "chore: release loki helm chart ${{ steps.update.outputs.new_chart_version }}"

diff --git a/.github/workflows/operator-bundle.yaml b/.github/workflows/operator-bundle.yaml
@@ -19,7 +19,7 @@ jobs:
         go: ['1.22']
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
       id: go

diff --git a/.github/workflows/operator-images.yaml b/.github/workflows/operator-images.yaml
@@ -48,7 +48,7 @@ jobs:
          echo "IMAGE_TAGS=$IMAGE_TAGS" >> $GITHUB_OUTPUT
 
      - name: Build and publish image on quay.io
-       uses: docker/build-push-action@v5
+       uses: docker/build-push-action@v6
        with:
          context: ./operator
          push: true
@@ -86,7 +86,7 @@ jobs:
          echo "IMAGE_TAGS=$IMAGE_TAGS" >> $GITHUB_OUTPUT
 
      - name: Build and publish image on quay.io
-       uses: docker/build-push-action@v5
+       uses: docker/build-push-action@v6
        with:
          context: ./operator/bundle/openshift
          file: ./operator/bundle/openshift/bundle.Dockerfile
@@ -125,7 +125,7 @@ jobs:
          echo "IMAGE_TAGS=$IMAGE_TAGS" >> $GITHUB_OUTPUT
 
      - name: Build and publish image on quay.io
-       uses: docker/build-push-action@v5
+       uses: docker/build-push-action@v6
        with:
          context: ./operator
          file: ./operator/calculator.Dockerfile

diff --git a/.github/workflows/operator-scorecard.yaml b/.github/workflows/operator-scorecard.yaml
@@ -19,7 +19,7 @@ jobs:
         go: ['1.22']
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
       id: go

diff --git a/.github/workflows/operator.yaml b/.github/workflows/operator.yaml
@@ -21,7 +21,7 @@ jobs:
     - name: Install make
       run: sudo apt-get install make
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
       id: go
@@ -43,13 +43,13 @@ jobs:
     - name: Install make
       run: sudo apt-get install make
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
       id: go
     - uses: actions/checkout@v4
     - name: Lint
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v6
       with:
         version: v1.61.0
         args: --timeout=5m
@@ -69,7 +69,7 @@ jobs:
     - name: Install make
       run: sudo apt-get install make
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
       id: go
@@ -90,7 +90,7 @@ jobs:
     - name: Install make
       run: sudo apt-get install make
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
       id: go
@@ -111,7 +111,7 @@ jobs:
     - name: Install make
       run: sudo apt-get install make
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
       id: go

diff --git a/.github/workflows/promtail-windows-test.yml b/.github/workflows/promtail-windows-test.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
       # You can test your matrix by printing the current Go version

diff --git a/.github/workflows/syft-sbom-ci.yml b/.github/workflows/syft-sbom-ci.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Anchore SBOM Action
-      uses: anchore/[email protected].7
+      uses: anchore/[email protected].8
       with:
          artifact-name: ${{ github.event.repository.name }}-spdx.json
 
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  ".": "3.2.1",
+  ".": "3.3.0",
   "operator": "0.7.1"
 }