diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fbd849c77e25..76444c92aae9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,12 +1,15 @@ { "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json", - "name": "ClusterTool Cluster", - "image": "tccr.io/tccr/devcontainer:v1.0.0-RC24@sha256:9a4482dd6e69d5684352b2af4715cec9e557208913a26718e208c213fbc4927b", - "initializeCommand": "docker pull tccr.io/tccr/devcontainer:v1.0.0-RC24", + "name": "TrueCharts", + "image": "tccr.io/tccr/devcontainer:v1.0.0-RC28", + "initializeCommand": "docker pull tccr.io/tccr/devcontainer:v1.0.0-RC28", "postCreateCommand": { "setup": "bash ${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh" }, "postStartCommand": { "git": "git config --global --add safe.directory ${containerWorkspaceFolder}" - } + }, + "postAttachCommand": "fish", + "updateRemoteUserUID": false, + "runArgs": ["--privileged"] } diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh index 01edfdb3d9f8..445d27d80890 100755 --- a/.devcontainer/postCreateCommand.sh +++ b/.devcontainer/postCreateCommand.sh @@ -16,4 +16,3 @@ fisher install PatrickF1/fzf.fish if ! grep -q "venv /workspaces/" .venv/pyvenv.cfg; then rm -rf .venv fi -task workstation:venv diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 6adfca1ba700..004dc0a45e8e 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,14 +1,14 @@ { "recommendations": [ - "redhat.vscode-yaml", - "mrmlnc.vscode-duplicate", - "mhutchie.git-graph", - "eamodio.gitlens", - "yzhang.markdown-all-in-one", - "searKing.preview-vscode", - "DavidAnson.vscode-markdownlint", - "IgorSbitnev.error-gutters", + "albert.TabOut", + "mikestead.dotenv", + "mitchdenny.ecdc", + "signageos.signageos-vscode-sops", + "EditorConfig.editorconfig", + "PKief.material-icon-theme", "usernamehw.errorlens", + "redhat.vscode-yaml", + "weaveworks.vscode-gitops-tools", "Tim-Koehler.helm-intellisense", "ms-kubernetes-tools.vscode-kubernetes-tools", "sandipchitale.vscode-kubernetes-helm-extras", diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000000..47f83adc156e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,20 @@ +{ + "files.associations": { + "*.json5": "jsonc", + "./kubernetes/**/*.sops.toml": "plaintext" + }, + "sops.defaults.ageKeyFile": "age.key", + "yaml.schemas": { + "Kubernetes": "./kubernetes/*.yaml" + }, + "vs-kubernetes": { + "vs-kubernetes.kubeconfig": "/workspaces/cluster/kubeconfig", + "vs-kubernetes.knownKubeconfigs": ["/workspaces/cluster/kubeconfig"] + }, + "terminal.integrated.profiles.linux": { + "bash": { + "path": "/usr/bin/fish" + } + }, + "terminal.integrated.defaultProfile.linux": "fish" +} diff --git a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/devcontainer.json b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/devcontainer.json index e3ea1ec99450..2e67ff3485a4 100644 --- a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/devcontainer.json +++ b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/devcontainer.json @@ -1,12 +1,15 @@ { "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json", - "name": "TrueCharts", - "image": "tccr.io/tccr/devcontainer:v1.0.0-RC24", - "initializeCommand": "docker pull tccr.io/tccr/devcontainer:v1.0.0-RC24", + "name": "ClusterTool Cluster", + "image": "tccr.io/tccr/devcontainer:v1.0.0-RC28", + "initializeCommand": "docker pull tccr.io/tccr/devcontainer:v1.0.0-RC28", "postCreateCommand": { "setup": "bash ${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh" }, "postStartCommand": { "git": "git config --global --add safe.directory ${containerWorkspaceFolder}" - } + }, + "postAttachCommand": "fish", + "updateRemoteUserUID": false, + "runArgs": ["--privileged"] } diff --git a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh index 01edfdb3d9f8..445d27d80890 100755 --- a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh +++ b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh @@ -16,4 +16,3 @@ fisher install PatrickF1/fzf.fish if ! grep -q "venv /workspaces/" .venv/pyvenv.cfg; then rm -rf .venv fi -task workstation:venv