-
Notifications
You must be signed in to change notification settings - Fork 569
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dwilson/set-compactor-max-limits-override
- Loading branch information
Showing
556 changed files
with
9,446 additions
and
4,067 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,36 @@ | ||
| name: Backport PR Creator | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| pull_request: | ||
| types: | ||
| - closed | ||
| - labeled | ||
|
|
||
| permissions: | ||
| contents: read | ||
| id-token: write | ||
|
|
||
| jobs: | ||
| main: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Retrieve GitHub App credentials from Vault | ||
| id: get-secrets | ||
| uses: grafana/shared-workflows/actions/[email protected] | ||
| with: | ||
| repo_secrets: | | ||
| APP_ID=mimir-github-bot:app_id | ||
| PRIVATE_KEY=mimir-github-bot:private_key | ||
| - name: Generate GitHub App token | ||
| id: app-token | ||
| uses: actions/create-github-app-token@v1 | ||
| with: | ||
| app-id: ${{ env.APP_ID }} | ||
| private-key: ${{ env.PRIVATE_KEY }} | ||
| owner: ${{ github.repository_owner }} | ||
|
|
||
| - name: Checkout Actions | ||
| uses: actions/checkout@v4 | ||
| with: | ||
|
|
@@ -17,11 +39,13 @@ jobs: | |
| # pin the version to before https://github.com/grafana/grafana-github-actions/pull/113 because | ||
| # we don't want to have the same strict rules for PR labels | ||
| ref: d284afd314ca3625c23595e9f62b52d215ead7ce | ||
|
|
||
| - name: Install Actions | ||
| run: npm install --production --prefix ./actions | ||
|
|
||
| - name: Run backport | ||
| uses: ./actions/backport | ||
| with: | ||
| token: ${{secrets.GH_BOT_ACCESS_TOKEN}} | ||
| token: ${{ steps.app-token.outputs.token }} | ||
| labelsToAdd: "backport" | ||
| title: "[{{base}}] {{originalTitle}}" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,11 +7,16 @@ on: | |
| paths: | ||
| - 'operations/helm/**' | ||
|
|
||
| # These permissions are needed to assume roles from Github's OIDC. | ||
| permissions: | ||
| contents: read | ||
| id-token: write | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.event.pull_request.number }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| jobs: | ||
| prepare: | ||
| if: github.event.pull_request.user.login == 'renovate[bot]' | ||
| runs-on: ubuntu-latest | ||
|
|
@@ -33,28 +38,50 @@ jobs: | |
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| # Retrieve GitHub App Credentials from Vault | ||
| - name: Retrieve GitHub App Credentials from Vault | ||
| id: get-secrets | ||
| uses: grafana/shared-workflows/actions/[email protected] | ||
| with: | ||
| token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} | ||
| repo_secrets: | | ||
| APP_ID=mimir-github-bot:app_id | ||
| PRIVATE_KEY=mimir-github-bot:private_key | ||
| # Generate GitHub App Token (Directly in the Job That Needs It) | ||
| - name: Generate GitHub App Token | ||
| id: token | ||
| uses: actions/create-github-app-token@v1 | ||
| with: | ||
| # Variables generated by the previous step get-secrets | ||
| app-id: ${{ env.APP_ID }} | ||
| private-key: ${{ env.PRIVATE_KEY }} | ||
| owner: ${{ github.repository_owner }} | ||
|
|
||
| - name: Checkout Repository with App Token | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| token: ${{ steps.token.outputs.token }} | ||
|
|
||
| - name: Run Git Config | ||
| run: | | ||
| git config --global --add safe.directory '*' | ||
| git config --global user.email "${{ github.event.pull_request.user.login }}@users.noreply.github.com" | ||
| git config --global user.name "${{ github.event.pull_request.user.login }}" | ||
| - name: Install the gh cli | ||
| uses: ksivamuthu/actions-setup-gh-cli@v2 | ||
|
|
||
| - name: Checkout Pull Request Branch | ||
| run: gh pr checkout ${{ github.event.pull_request.number }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GH_BOT_ACCESS_TOKEN }} | ||
| GITHUB_TOKEN: ${{ steps.token.outputs.token }} | ||
|
|
||
| - name: Run make targets | ||
| id: update | ||
| run: | | ||
| make BUILD_IN_CONTAINER=false doc build-helm-tests | ||
| - name: Check Updates | ||
| id: check_updates | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,37 @@ | ||
| name: Auto-review Grafanabot PRs | ||
| on: pull_request_target | ||
| on: pull_request | ||
|
|
||
| permissions: | ||
| pull-requests: write | ||
| contents: write | ||
| id-token: write | ||
|
|
||
| jobs: | ||
| dependabot-reviewer: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| if: ${{ github.event.pull_request.user.login == 'grafanabot' }} | ||
|
|
||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Retrieve GitHub App Credentials from Vault | ||
| id: get-secrets | ||
| uses: grafana/shared-workflows/actions/[email protected] | ||
| with: | ||
| repo_secrets: | | ||
| APP_ID=mimir-github-bot:app_id | ||
| PRIVATE_KEY=mimir-github-bot:private_key | ||
| - name: Generate GitHub App Token | ||
| id: app-token | ||
| uses: actions/create-github-app-token@v1 | ||
| with: | ||
| app-id: ${{ env.APP_ID }} | ||
| private-key: ${{ env.PRIVATE_KEY }} | ||
| owner: ${{ github.repository_owner }} | ||
|
|
||
| - name: Approve and auto-merge | ||
| id: auto-merge | ||
| if: contains(github.event.pull_request.head.ref, 'helm-chart-weekly-') | ||
|
|
@@ -24,7 +41,7 @@ jobs: | |
| --approve -b "**I'm approving** this pull request, since it is a helm release." | ||
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GITHUB_TOKEN: ${{secrets.GH_BOT_ACCESS_TOKEN}} | ||
| GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} | ||
|
|
||
| - name: Manual review is required | ||
| if: steps.auto-merge.conclusion != 'success' | ||
|
|
@@ -33,4 +50,4 @@ jobs: | |
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} | ||
| GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,21 +6,42 @@ on: | |
|
|
||
| workflow_dispatch: # for manual testing | ||
|
|
||
| # These permissions are needed to assume roles from Github's OIDC. | ||
| permissions: | ||
| contents: read | ||
| id-token: write | ||
|
|
||
| jobs: | ||
| weekly-release-pr: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: imjasonh/[email protected] | ||
|
|
||
| - name: Retrieve GitHub App credentials from Vault | ||
| id: get-secrets | ||
| uses: grafana/shared-workflows/actions/[email protected] | ||
| with: | ||
| repo_secrets: | | ||
| APP_ID=mimir-github-bot:app_id | ||
| PRIVATE_KEY=mimir-github-bot:private_key | ||
| - name: Generate GitHub App token | ||
| id: app-token | ||
| uses: actions/create-github-app-token@v1 | ||
| with: | ||
| app-id: ${{ env.APP_ID }} | ||
| private-key: ${{ env.PRIVATE_KEY }} | ||
| owner: ${{ github.repository_owner }} | ||
|
|
||
| - name: Update/regenerate files | ||
| id: update | ||
| run: bash .github/workflows/scripts/helm-weekly-release.sh | ||
|
|
||
| - name: Create Pull Request | ||
| uses: peter-evans/create-pull-request@v5 | ||
| with: | ||
| token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} | ||
| token: ${{ steps.app-token.outputs.token }} | ||
| title: Release mimir-distributed Helm chart ${{ steps.update.outputs.new_chart_version }} | ||
| body: Automated PR created by [helm-weekly-release-pr.yaml](https://github.com/grafana/mimir/blob/main/.github/workflows/helm-weekly-release-pr.yaml) | ||
| commit-message: Update mimir-distributed chart to ${{ steps.update.outputs.new_chart_version }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.