From 619f4a99d6e93425983456dcbfc7bbfe06781bd5 Mon Sep 17 00:00:00 2001 From: alfi0812 <43101280+alfi0812@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:14:06 +0100 Subject: [PATCH] Update devcontainer.json (#28901) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning - [ ] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):` or `chore(chart-name):` **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: alfi0812 <43101280+alfi0812@users.noreply.github.com> Signed-off-by: Kjeld Schouten Co-authored-by: Kjeld Schouten --- .devcontainer/devcontainer.json | 11 ++++++---- .devcontainer/postCreateCommand.sh | 1 - .vscode/extensions.json | 16 +++++++-------- .vscode/settings.json | 20 +++++++++++++++++++ .../DOTREPLACEdevcontainer/devcontainer.json | 11 ++++++---- .../postCreateCommand.sh | 1 - 6 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fbd849c77e2..76444c92aae 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 01edfdb3d9f..445d27d8089 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 6adfca1ba70..004dc0a45e8 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 00000000000..47f83adc156 --- /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 e3ea1ec9945..2e67ff3485a 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 01edfdb3d9f..445d27d8089 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