Skip to content

Commit 7d9a05b

Browse files
defelmnqdefelmnq
committed
Merge remote-tracking branch 'origin/main' into agent_resource_monitoring
2 parents 8a79421 + a68d115 commit 7d9a05b

File tree

195 files changed

+5756
-2892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+5756
-2892
lines changed

‎.github/ISSUE_TEMPLATE/1-bug.yaml

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: "🐞 Bug"
2+
description: "File a bug report."
3+
title: "<title>"
4+
labels: ["needs-triage"]
5+
body:
6+
- type: checkboxes
7+
id: existing_issues
8+
attributes:
9+
label: "Is there an existing issue for this?"
10+
description: "Please search to see if an issue already exists for the bug you encountered."
11+
options:
12+
- label: "I have searched the existing issues"
13+
required: true
14+
15+
- type: textarea
16+
id: issue
17+
attributes:
18+
label: "Current Behavior"
19+
description: "A concise description of what you're experiencing."
20+
placeholder: "Tell us what you see!"
21+
validations:
22+
required: false
23+
24+
- type: textarea
25+
id: logs
26+
attributes:
27+
label: "Relevant Log Output"
28+
description: "Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks."
29+
render: shell
30+
31+
- type: textarea
32+
id: expected
33+
attributes:
34+
label: "Expected Behavior"
35+
description: "A concise description of what you expected to happen."
36+
validations:
37+
required: false
38+
39+
- type: textarea
40+
id: steps_to_reproduce
41+
attributes:
42+
label: "Steps to Reproduce"
43+
description: "Provide step-by-step instructions to reproduce the issue."
44+
placeholder: |
45+
1. First step
46+
2. Second step
47+
3. Another step
48+
4. Issue occurs
49+
validations:
50+
required: true
51+
52+
- type: textarea
53+
id: environment
54+
attributes:
55+
label: "Environment"
56+
description: |
57+
Provide details about your environment:
58+
- **Host OS**: (e.g., Ubuntu 24.04, Debian 12)
59+
- **Coder Version**: (e.g., v2.18.4)
60+
placeholder: |
61+
Run `coder version` to get Coder version
62+
value: |
63+
- Host OS:
64+
- Coder version:
65+
validations:
66+
required: false
67+
68+
- type: dropdown
69+
id: additional_info
70+
attributes:
71+
label: "Additional Context"
72+
description: "Select any applicable options:"
73+
multiple: true
74+
options:
75+
- "The issue occurs consistently"
76+
- "The issue is new (previously worked fine)"
77+
- "The issue happens on multiple deployments"
78+
- "I have tested this on the latest version"

‎.github/ISSUE_TEMPLATE/config.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
contact_links:
2+
- name: Questions, suggestion or feature requests?
3+
url: https://github.com/coder/coder/discussions/new/choose
4+
about: Our preferred starting point if you have any questions or suggestions about configuration, features or unexpected behavior.
5+
- name: Coder Docs
6+
url: https://coder.com/docs
7+
about: Check our docs.
8+
- name: Coder Discord Community
9+
url: https://discord.gg/coder
10+
about: Get in touch with the Coder developers and community for support.

‎.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
189189
# Check for any typos
190190
- name: Check for typos
191-
uses: crate-ci/typos@685eb3d55be2f85191e8c84acb9f44d7756f84ab # v1.29.4
191+
uses: crate-ci/typos@11ca4583f2f3f74c7e7785c0ecb20fe2c99a4308 # v1.29.5
192192
with:
193193
config: .github/workflows/typos.toml
194194

@@ -1173,13 +1173,13 @@ jobs:
11731173
fetch-depth: 0
11741174

11751175
- name: Authenticate to Google Cloud
1176-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
1176+
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
11771177
with:
11781178
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
11791179
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com
11801180

11811181
- name: Set up Google Cloud SDK
1182-
uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2
1182+
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
11831183

11841184
- name: Set up Flux CLI
11851185
uses: fluxcd/flux2/action@5350425cdcd5fa015337e09fa502153c0275bd4b # v2.4.0
@@ -1188,7 +1188,7 @@ jobs:
11881188
version: "2.2.1"
11891189

11901190
- name: Get Cluster Credentials
1191-
uses: google-github-actions/get-gke-credentials@9025e8f90f2d8e0c3dafc3128cc705a26d992a6a # v2.3.0
1191+
uses: google-github-actions/get-gke-credentials@7a108e64ed8546fe38316b4086e91da13f4785e1 # v2.3.1
11921192
with:
11931193
cluster_name: dogfood-v2
11941194
location: us-central1-a

‎.github/workflows/contrib.yaml

+6-80
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ name: contrib
22

33
on:
44
issue_comment:
5-
types: [created]
6-
pull_request:
5+
types: [created, edited]
6+
pull_request_target:
77
types:
88
- opened
99
- closed
1010
- synchronize
1111
- labeled
1212
- unlabeled
13-
- opened
1413
- reopened
1514
- edited
1615
# For jobs that don't run on draft PRs.
@@ -23,88 +22,13 @@ permissions:
2322
concurrency: pr-${{ github.ref }}
2423

2524
jobs:
26-
# Dependabot is annoying, but this makes it a bit less so.
27-
dependabot-automerge:
28-
runs-on: ubuntu-latest
29-
if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'coder/coder'
30-
permissions:
31-
pull-requests: write
32-
contents: write
33-
steps:
34-
- name: Dependabot metadata
35-
id: metadata
36-
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
37-
with:
38-
github-token: "${{ secrets.GITHUB_TOKEN }}"
39-
40-
- name: Approve the PR
41-
run: gh pr review --approve "$PR_URL"
42-
env:
43-
PR_URL: ${{github.event.pull_request.html_url}}
44-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
45-
46-
- name: Enable auto-merge for Dependabot PRs
47-
run: gh pr merge --auto --squash "$PR_URL"
48-
env:
49-
PR_URL: ${{github.event.pull_request.html_url}}
50-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
51-
52-
dependabot-automerge-notify:
53-
# Send a slack notification when a dependabot PR is merged.
54-
runs-on: ubuntu-latest
55-
if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'coder/coder' && github.event.pull_request.merged
56-
steps:
57-
- name: Send Slack notification
58-
env:
59-
PR_URL: ${{github.event.pull_request.html_url}}
60-
PR_TITLE: ${{github.event.pull_request.title}}
61-
PR_NUMBER: ${{github.event.pull_request.number}}
62-
run: |
63-
curl -X POST -H 'Content-type: application/json' \
64-
--data '{
65-
"username": "dependabot",
66-
"icon_url": "https://avatars.githubusercontent.com/u/27347476",
67-
"blocks": [
68-
{
69-
"type": "header",
70-
"text": {
71-
"type": "plain_text",
72-
"text": ":pr-merged: Auto merged Dependabot PR #${{ env.PR_NUMBER }}",
73-
"emoji": true
74-
}
75-
},
76-
{
77-
"type": "section",
78-
"fields": [
79-
{
80-
"type": "mrkdwn",
81-
"text": "${{ env.PR_TITLE }}"
82-
}
83-
]
84-
},
85-
{
86-
"type": "actions",
87-
"elements": [
88-
{
89-
"type": "button",
90-
"text": {
91-
"type": "plain_text",
92-
"text": "View PR"
93-
},
94-
"url": "${{ env.PR_URL }}"
95-
}
96-
]
97-
}
98-
]
99-
}' ${{ secrets.DEPENDABOT_PRS_SLACK_WEBHOOK }}
100-
10125
cla:
10226
runs-on: ubuntu-latest
10327
permissions:
10428
pull-requests: write
10529
steps:
10630
- name: cla
107-
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request'
31+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
10832
uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
10933
env:
11034
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -122,8 +46,10 @@ jobs:
12246

12347
release-labels:
12448
runs-on: ubuntu-latest
49+
permissions:
50+
pull-requests: write
12551
# Skip tagging for draft PRs.
126-
if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.draft }}
52+
if: ${{ github.event_name == 'pull_request_target' && !github.event.pull_request.draft }}
12753
steps:
12854
- name: release-labels
12955
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

‎.github/workflows/dependabot.yaml

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: dependabot
2+
# Dependabot is annoying, but this makes it a bit less so.
3+
4+
on:
5+
pull_request:
6+
types: [opened, closed]
7+
8+
permissions:
9+
contents: read
10+
11+
# Only run one instance per PR to ensure in-order execution.
12+
concurrency: pr-${{ github.ref }}
13+
14+
jobs:
15+
dependabot-automerge:
16+
runs-on: ubuntu-latest
17+
if: >
18+
github.event_name == 'pull_request' &&
19+
github.event.action == 'opened' &&
20+
github.event.pull_request.user.login == 'dependabot[bot]' &&
21+
github.actor_id == 49699333 &&
22+
github.repository == 'coder/coder'
23+
permissions:
24+
pull-requests: write
25+
contents: write
26+
steps:
27+
- name: Dependabot metadata
28+
id: metadata
29+
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
30+
with:
31+
github-token: "${{ secrets.GITHUB_TOKEN }}"
32+
33+
- name: Approve the PR
34+
run: |
35+
echo "Approving $PR_URL"
36+
gh pr review --approve "$PR_URL"
37+
env:
38+
PR_URL: ${{github.event.pull_request.html_url}}
39+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
40+
41+
- name: Enable auto-merge
42+
run: |
43+
echo "Enabling auto-merge for $PR_URL"
44+
gh pr merge --auto --squash "$PR_URL"
45+
env:
46+
PR_URL: ${{github.event.pull_request.html_url}}
47+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
48+
49+
dependabot-automerge-notify:
50+
# Send a slack notification when a dependabot PR is merged.
51+
runs-on: ubuntu-latest
52+
if: >
53+
github.event_name == 'pull_request' &&
54+
github.event.action == 'closed' &&
55+
github.event.pull_request.merged == true &&
56+
github.event.pull_request.user.login == 'dependabot[bot]' &&
57+
github.repository == 'coder/coder'
58+
steps:
59+
- name: Send Slack notification
60+
env:
61+
PR_URL: ${{github.event.pull_request.html_url}}
62+
PR_TITLE: ${{github.event.pull_request.title}}
63+
PR_NUMBER: ${{github.event.pull_request.number}}
64+
run: |
65+
curl -X POST -H 'Content-type: application/json' \
66+
--data '{
67+
"username": "dependabot",
68+
"icon_url": "https://avatars.githubusercontent.com/u/27347476",
69+
"blocks": [
70+
{
71+
"type": "header",
72+
"text": {
73+
"type": "plain_text",
74+
"text": ":pr-merged: Auto merged Dependabot PR #${{ env.PR_NUMBER }}",
75+
"emoji": true
76+
}
77+
},
78+
{
79+
"type": "section",
80+
"fields": [
81+
{
82+
"type": "mrkdwn",
83+
"text": "${{ env.PR_TITLE }}"
84+
}
85+
]
86+
},
87+
{
88+
"type": "actions",
89+
"elements": [
90+
{
91+
"type": "button",
92+
"text": {
93+
"type": "plain_text",
94+
"text": "View PR"
95+
},
96+
"url": "${{ env.PR_URL }}"
97+
}
98+
]
99+
}
100+
]
101+
}' ${{ secrets.DEPENDABOT_PRS_SLACK_WEBHOOK }}

‎.github/workflows/dogfood.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
uses: ./.github/actions/setup-tf
110110

111111
- name: Authenticate to Google Cloud
112-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
112+
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
113113
with:
114114
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
115115
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com

‎.github/workflows/release.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -284,14 +284,14 @@ jobs:
284284
# Setup GCloud for signing Windows binaries.
285285
- name: Authenticate to Google Cloud
286286
id: gcloud_auth
287-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
287+
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
288288
with:
289289
workload_identity_provider: ${{ secrets.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
290290
service_account: ${{ secrets.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
291291
token_format: "access_token"
292292

293293
- name: Setup GCloud SDK
294-
uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2
294+
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
295295

296296
- name: Build binaries
297297
run: |
@@ -459,13 +459,13 @@ jobs:
459459
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.GPG_RELEASE_KEY_BASE64 }}
460460

461461
- name: Authenticate to Google Cloud
462-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
462+
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
463463
with:
464464
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_ID_PROVIDER }}
465465
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
466466

467467
- name: Setup GCloud SDK
468-
uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # 2.1.2
468+
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # 2.1.4
469469

470470
- name: Publish Helm Chart
471471
if: ${{ !inputs.dry_run }}

‎.github/workflows/scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: "Upload to code-scanning"
50-
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
50+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
5151
with:
5252
sarif_file: results.sarif

0 commit comments

Comments
 (0)