diff --git a/.devcontainer/ci/features/install.sh b/.devcontainer/ci/features/install.sh index 2f5d9c2f..91740293 100644 --- a/.devcontainer/ci/features/install.sh +++ b/.devcontainer/ci/features/install.sh @@ -35,11 +35,8 @@ for installer_path in \ "go-task/task!" \ "k0sproject/k0sctl!" \ "stern/stern!" \ + "siderolabs/talos!!?as=talosctl" \ "yannh/kubeconform!" do curl -fsSL "https://i.jpillora.com/${installer_path}" | bash done - -curl -fsSL -o /usr/local/bin/talosctl \ - "https://github.com/siderolabs/talos/releases/latest/download/talosctl-linux-${ARCH}" -chmod +x /usr/local/bin/talosctl diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d73602a2..37fb0239 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,6 +3,6 @@ "name": "Flux Cluster Template", "image": "ghcr.io/onedr0p/flux-cluster-template/devcontainer:base", "postCreateCommand": { - "deps": "${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh" + "deps": "bash ${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh" } } diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh index 642213a5..62b819a6 100755 --- a/.devcontainer/postCreateCommand.sh +++ b/.devcontainer/postCreateCommand.sh @@ -1,12 +1,17 @@ #!/usr/bin/env bash +set -e +set -o noglob + +# Create the fish configuration directory +mkdir -p ~/.config/fish/conf.d # Hook direnv into fish -cat << EOF > ~/.config/fish/conf.d/direnv.fish +tee ~/.config/fish/conf.d/direnv.fish > /dev/null < ~/.config/fish/conf.d/starship.fish +tee ~/.config/fish/conf.d/starship.fish > /dev/null < /var/lib/k0s/manifests/kube-vip/kube-vip-rbac.yaml +tee /var/lib/k0s/manifests/kube-vip/kube-vip-rbac.yaml > /dev/null < /var/lib/k0s/manifests/kube-vip/kube-vip-ds.yaml +tee /var/lib/k0s/manifests/kube-vip/kube-vip-ds.yaml > /dev/null < /etc/resolv.conf +tee /etc/resolv.conf > /dev/null < /etc/sysctl.d/99-kubernetes.conf +tee /etc/sysctl.d/99-kubernetes.conf > /dev/null < /etc/profile.d/neofetch.sh +tee /etc/profile.d/neofetch.sh > /dev/null < /etc/k0s/containerd.d/default.toml +tee /etc/k0s/containerd.d/default.toml > /dev/null <