Align devcontainer with etcd-io/etcd.

Signed-off-by: James Blair <[email protected]> Signed-off-by: liyang <[email protected]>
etcd-io · Dec 27, 2024 · deabf61 · deabf61
1 parent dcc52f3
commit deabf61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,9 +1,11 @@
 {
   "name": "Kubebuilder DevContainer",
-  "image": "golang:1.22",
+  "image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm",
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:2": {},
-    "ghcr.io/devcontainers/features/git:1": {}
+    "ghcr.io/devcontainers/features/git:1": {},
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
   },
 
   "runArgs": ["--network=host"],
@@ -22,4 +24,3 @@
 
   "onCreateCommand": "bash .devcontainer/post-install.sh"
 }
-
diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh
@@ -3,16 +3,11 @@ set -x
 
 curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
 chmod +x ./kind
-mv ./kind /usr/local/bin/kind
+sudo mv ./kind /usr/local/bin/kind
 
 curl -L -o kubebuilder https://go.kubebuilder.io/dl/latest/linux/amd64
 chmod +x kubebuilder
-mv kubebuilder /usr/local/bin/
-
-KUBECTL_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
-curl -LO "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl"
-chmod +x kubectl
-mv kubectl /usr/local/bin/kubectl
+sudo mv kubebuilder /usr/local/bin/
 
 docker network create -d=bridge --subnet=172.19.0.0/24 kind