Skip to content

Commit

Permalink
Merge branch 'main' into fix-disk-space-utilization-panels
Browse files Browse the repository at this point in the history
  • Loading branch information
QuentinBisson authored Sep 17, 2024
2 parents 321a13e + 1e939aa commit 82d3044
Show file tree
Hide file tree
Showing 3,398 changed files with 725,309 additions and 326,203 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.33.4",
"image": "grafana/loki-build-image:0.33.6",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},
Expand Down
6 changes: 3 additions & 3 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.4
image: grafana/loki-build-image:0.33.6
name: documentation-helm-reference-check
trigger:
ref:
Expand Down Expand Up @@ -1085,7 +1085,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
image: grafana/loki-build-image:0.33.4
image: grafana/loki-build-image:0.33.6
name: build and push
privileged: true
volumes:
Expand Down Expand Up @@ -1308,6 +1308,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 335170654951c8fdd9cb1b96b4290febb74b86ebab07cfe65d680299faa767bf
hmac: 3b3b039769ab8c44318749efec569ffe50c4cfb173f577422ec9d514054f0a9e

...
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "adca1c07a2199374e1646e62331926509699368b"
"version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "adca1c07a2199374e1646e62331926509699368b",
"sum": "/6NMt3DFr1mpaBxncbwBJVV5vBpAMIyP3XNOoFArz5Q="
"version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56",
"sum": "kVlVZPpPz8d/D6UGK9Hto+NeGy7z8NvGygcB1QboxWw="
}
],
"legacyImports": false
Expand Down
14 changes: 9 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
type/docs:
- 'docs/**/*'
- 'operator/docs/*'
- changed-files:
- any-glob-to-any-file: 'docs/**/*'
- any-glob-to-any-file: 'operator/docs/*'
sig/operator:
- 'operator/**/*'
- changed-files:
- any-glob-to-any-file: 'operator/**/*'
kind/feature:
- 'operator/docs/enhancements/*'
- changed-files:
- any-glob-to-any-file: 'operator/docs/enhancements/*'
area/helm:
- 'production/helm/**/*'
- changed-files:
- any-glob-to-any-file: 'production/helm/**/*'
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
],
"labels": ["dependencies"],
"prHourlyLimit": 4,
"baseBranches": ["main", "release-2.9.x", "release-2.8.x"],
"baseBranches": ["main"],
"packageRules": [
{
"matchBaseBranches": ["release-2.9.x","release-2.8.x"],
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 0 additions & 26 deletions .github/workflows/backport.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.33.4"
"build_image": "grafana/loki-build-image:0.33.6"
"golang_ci_lint_version": "v1.55.1"
"release_lib_ref": "main"
"skip_validation": false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependabot_reviewer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.6.0
uses: dependabot/fetch-metadata@v2.2.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
doc-validator:
runs-on: "ubuntu-latest"
container:
image: "grafana/doc-validator:v5.0.0"
image: "grafana/doc-validator:v5.1.0"
steps:
- name: "Checkout code"
uses: "actions/checkout@v4"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/helm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check Docs
run: |
Expand Down Expand Up @@ -43,24 +43,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v3
uses: azure/setup-helm@v4
with:
version: v3.8.2

# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
# yamllint (https://github.com/adrienverge/yamllint) which require Python
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.7

- name: Set up chart-testing
uses: helm/[email protected].0
uses: helm/[email protected].1

- name: Run chart-testing (list-changed)
id: list-changed
Expand Down
Loading

0 comments on commit 82d3044

Please sign in to comment.