Skip to content

Commit b6408e6

Browse files
authored
Merge branch 'main' into jfrog-maven
2 parents cf77c8a + 17734c0 commit b6408e6

File tree

5 files changed

+29
-25
lines changed

5 files changed

+29
-25
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Validate formatting
4949
run: bun fmt:ci
5050
- name: Check for typos
51-
uses: crate-ci/typos@v1.35.5
51+
uses: crate-ci/typos@v1.36.2
5252
with:
5353
config: .github/typos.toml
5454
validate-readme-files:
@@ -61,7 +61,7 @@ jobs:
6161
- name: Check out code
6262
uses: actions/checkout@v5
6363
- name: Set up Go
64-
uses: actions/setup-go@v5
64+
uses: actions/setup-go@v6
6565
with:
6666
go-version: "1.23.2"
6767
- name: Validate contributors

.github/workflows/deploy-registry.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
- name: Checkout code
3131
uses: actions/checkout@v5
3232
- name: Authenticate with Google Cloud
33-
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5
33+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093
3434
with:
3535
workload_identity_provider: projects/309789351055/locations/global/workloadIdentityPools/github-actions/providers/github
3636
service_account: [email protected]
3737
- name: Set up Google Cloud SDK
38-
uses: google-github-actions/setup-gcloud@26f734c2779b00b7dda794207734c511110a4368
38+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
3939
- name: Deploy to dev.registry.coder.com
4040
run: gcloud builds triggers run 29818181-126d-4f8a-a937-f228b27d3d34 --branch main
4141
- name: Deploy to registry.coder.com

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v5
18-
- uses: actions/setup-go@v5
18+
- uses: actions/setup-go@v6
1919
with:
2020
go-version: stable
2121
- name: golangci-lint

.github/workflows/version-bump.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
9696
- name: Comment on PR - Failure
9797
if: failure() && steps.version-check.outputs.versions_up_to_date == 'false'
98-
uses: actions/github-script@v7
98+
uses: actions/github-script@v8
9999
with:
100100
github-token: ${{ secrets.GITHUB_TOKEN }}
101101
script: |

registry/coder/templates/kubernetes-devcontainer/main.tf

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ variable "use_kubeconfig" {
4040

4141
variable "namespace" {
4242
type = string
43-
default = "default"
43+
default = "coder"
4444
description = "The Kubernetes namespace to create workspaces in (must exist prior to creating workspaces). If the Coder host is itself running as a Pod on the same Kubernetes cluster as you are deploying workspaces to, set this to the same namespace."
4545
}
4646

@@ -62,7 +62,7 @@ data "coder_parameter" "cpu" {
6262
display_name = "CPU"
6363
description = "CPU limit (cores)."
6464
default = "2"
65-
icon = "/emojis/1f5a5.png"
65+
icon = "/icon/memory.svg"
6666
mutable = true
6767
validation {
6868
min = 1
@@ -161,6 +161,8 @@ locals {
161161
# ENVBUILDER_GIT_URL and ENVBUILDER_CACHE_REPO will be overridden by the provider
162162
# if the cache repo is enabled.
163163
"ENVBUILDER_GIT_URL" : var.cache_repo == "" ? local.repo_url : "",
164+
# Used for when SSH is an available authentication mechanism for git providers
165+
"ENVBUILDER_GIT_SSH_PRIVATE_KEY_BASE64" : base64encode(try(data.coder_workspace_owner.me.ssh_private_key, "")),
164166
# Use the docker gateway if the access URL is 127.0.0.1
165167
"ENVBUILDER_INIT_SCRIPT" : replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal"),
166168
"ENVBUILDER_FALLBACK_IMAGE" : data.coder_parameter.fallback_image.value,
@@ -263,8 +265,9 @@ resource "kubernetes_deployment" "main" {
263265
name = "dev"
264266
image = var.cache_repo == "" ? local.devcontainer_builder_image : envbuilder_cached_image.cached.0.image
265267
image_pull_policy = "Always"
266-
security_context {}
267-
268+
security_context {
269+
privileged = true
270+
}
268271
# Set the environment using cached_image.cached.0.env if the cache repo is enabled.
269272
# Otherwise, use the local.envbuilder_env.
270273
# You could alternatively write the environment variables to a ConfigMap or Secret
@@ -352,21 +355,22 @@ resource "coder_agent" "main" {
352355
# if you don't want to display any information.
353356
# For basic resources, you can use the `coder stat` command.
354357
# If you need more control, you can write your own script.
355-
metadata {
356-
display_name = "CPU Usage"
357-
key = "0_cpu_usage"
358-
script = "coder stat cpu"
359-
interval = 10
360-
timeout = 1
361-
}
362-
363-
metadata {
364-
display_name = "RAM Usage"
365-
key = "1_ram_usage"
366-
script = "coder stat mem"
367-
interval = 10
368-
timeout = 1
369-
}
358+
# Note: May not work on AWS Linux Nodes See: https://github.com/coder/clistat/issues/17
359+
# metadata {
360+
# display_name = "CPU Usage"
361+
# key = "0_cpu_usage"
362+
# script = "coder stat cpu"
363+
# interval = 10
364+
# timeout = 1
365+
# }
366+
# Note: May not work on AWS Linux Nodes
367+
# metadata {
368+
# display_name = "RAM Usage"
369+
# key = "1_ram_usage"
370+
# script = "coder stat mem"
371+
# interval = 10
372+
# timeout = 1
373+
# }
370374

371375
metadata {
372376
display_name = "Workspaces Disk"

0 commit comments

Comments
 (0)