Skip to content

fix: do not mount workspace secrets and set defaults for system packages parameter #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2025
Merged

fix: do not mount workspace secrets and set defaults for system packages parameter #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions templates/kubernetes/homelab-workspace/deployment.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,6 @@ resource "kubernetes_deployment" "deployment" {
mount_path = "/home/all"
name = "home"
}
dynamic "volume_mount" {
for_each = var.test_mode ? {} : local.workspace_secrets
content {
name = "workspace-secrets"
mount_path = volume_mount.value
sub_path = volume_mount.key
read_only = true
}
}
volume_mount {
mount_path = "/agent-startup.sh"
name = "coder-scripts"
Expand Down Expand Up @@ -157,17 +148,6 @@ resource "kubernetes_deployment" "deployment" {
}
}
}
dynamic "volume" {
for_each = var.test_mode ? [] : toset(["coder-workspace-secrets"])
content {
name = "workspace-secrets"
secret {
secret_name = volume.key
optional = true
default_mode = "0440"
}
}
}
volume {
name = "coder-scripts"
config_map {
Expand Down
8 changes: 0 additions & 8 deletions templates/kubernetes/homelab-workspace/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,4 @@ locals {
}

home_directory = "/home/coder"

workspace_secrets = {
"github_auth_token" = "${local.home_directory}/.secret/github_token"
"github_public_key" = "${local.home_directory}/.secret/id_ed25519.pub"
"github_private_key" = "${local.home_directory}/.secret/id_ed25519"
"kubeconfig_nas" = "${local.home_directory}/.secret/kubeconfig_nas"
"kubeconfig_homelab" = "${local.home_directory}/.secret/kubeconfig_homelab"
}
}
2 changes: 1 addition & 1 deletion templates/kubernetes/homelab-workspace/parameters.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ data "coder_parameter" "resources_memory" {
data "coder_parameter" "system_packages" {
name = "system_packages"

default = jsonencode([])
default = jsonencode(["gnupg", "nmap"])
display_name = "System Packages"
description = "Additional system packages to install."
icon = "/icon/ubuntu.svg"
Expand Down
17 changes: 0 additions & 17 deletions templates/kubernetes/homelab-workspace/script-agent-startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,6 @@ set -eo pipefail


main() {
echo '------------------------------------------------------------'
echo 'Re-locating secrets from mounted location to their destinations...'
if [[ ! -f $HOME/.ssh/id_ed25519 ]]; then
if [[ -f $HOME/.secret/id_ed25519 ]]; then
mkdir -p $HOME/.ssh
cp $HOME/.secret/id_ed25519* $HOME/.ssh/
chmod 600 $HOME/.ssh/id_*
fi
fi

if [[ ! -d $HOME/.kube/conf.d ]]; then
mkdir -p $HOME/.kube/conf.d
if [[ -f $HOME/.secret/kubeconfig_homelab ]]; then
cp $HOME/.secret/kubeconfig_* $HOME/.kube/conf.d/
chmod 600 $HOME/.kube/conf.d/kubeconfig_*
fi
fi
echo '------------------------------------------------------------'
echo 'Done'
}
Expand Down