update ubuntu version for devcontainer (#2736)

* ♻️ update ubuntu version for devcontainer Signed-off-by: vankichi <[email protected]> * 💚 add platform opts Signed-off-by: vankichi <[email protected]> * ♻️ Remove unnecessary installation Signed-off-by: vankichi <[email protected]> * ♻️ Change install helm command Signed-off-by: vankichi <[email protected]> * ♻️ Fix Signed-off-by: vankichi <[email protected]> * ♻️ Fix Signed-off-by: vankichi <[email protected]> * ♻️ Fix Signed-off-by: vankichi <[email protected]> * 💚 remove platform opts Signed-off-by: vankichi <[email protected]> --------- Signed-off-by: vankichi <[email protected]> Co-authored-by: Yusuke Kato <[email protected]> Signed-off-by: kpango <[email protected]>
vdaas · Nov 19, 2024 · 9cc612a · 9cc612a
1 parent 246fb12
commit 9cc612a
Show file tree

Hide file tree

Showing 11 changed files with 469 additions and 151 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6024,7 +6024,7 @@
 - update dependencies version ([#381](https://github.com/vdaas/vald/pull/381))
 - Fix missing value on compressor health servers ([#377](https://github.com/vdaas/vald/pull/377))
 - Fix compressor readiness shutdown_duration / Fix cassandra … ([#376](https://github.com/vdaas/vald/pull/376))
-- Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 ([#375](https://github.com/vdaas/vald/pull/375))
+- Bump sigs.k8s.io/yaml from 2.2.8 to 2.3.0 ([#375](https://github.com/vdaas/vald/pull/375))
 - Fix`internal/log/format` to match the test template ([#369](https://github.com/vdaas/vald/pull/369))
 - Fix `internal/log/logger` to match the test template ([#371](https://github.com/vdaas/vald/pull/371))
 - Fix failing tests of `internal/log` and modified to match the test template ([#368](https://github.com/vdaas/vald/pull/368))

diff --git a/Makefile.d/helm.mk b/Makefile.d/helm.mk
@@ -20,7 +20,12 @@ helm/install: $(BINDIR)/helm
 
 $(BINDIR)/helm:
 	mkdir -p $(BINDIR)
-	curl -fsSL "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" | HELM_INSTALL_DIR=$(BINDIR) bash
+	$(eval DARCH := $(subst aarch64,arm64,$(ARCH)))
+	TAR_NAME=helm-$(HELM_VERSION)-$(OS)-$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]')) \
+	    && cd $(TEMP_DIR) \
+	    && curl -fsSL "https://get.helm.sh/$${TAR_NAME}.tar.gz" -o "$(TEMP_DIR)/$${TAR_NAME}" \
+	    && tar -xzvf "$(TEMP_DIR)/$${TAR_NAME}" --strip=1 \
+	    && mv helm $(BINDIR)/helm
 
 .PHONY: helm-docs/install
 ## install helm-docs
@@ -32,7 +37,7 @@ $(BINDIR)/helm-docs:
 	TAR_NAME=helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(DARCH).tar.gz \
 	    && cd $(TEMP_DIR) \
 	    && curl -fsSL "https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/$${TAR_NAME}" -o "$(TEMP_DIR)/$${TAR_NAME}"\
-	    && tar xzvf "$(TEMP_DIR)/$${TAR_NAME}" \
+	    && tar -xzvf "$(TEMP_DIR)/$${TAR_NAME}" \
 	    && mv helm-docs $(BINDIR)/helm-docs
 
 .PHONY: helm/package/vald

diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile
@@ -19,7 +19,7 @@
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
 ARG UPX_OPTIONS=-9
 # skipcq: DOK-DL3026,DOK-DL3007
-FROM mcr.microsoft.com/devcontainers/base:ubuntu22.04
+FROM mcr.microsoft.com/devcontainers/base:ubuntu24.04
 LABEL maintainer="vdaas.org vald team <[email protected]>"
 # skipcq: DOK-DL3002
 USER root:root
@@ -65,15 +65,10 @@ RUN --mount=type=bind,target=.,rw \
     && apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends --fix-missing \
-    curl \
-    gnupg \
-    software-properties-common \
-    && add-apt-repository ppa:ubuntu-toolchain-r/test -y \
-    && apt-get update -y \
-    && apt-get upgrade -y \
-    && apt-get install -y --no-install-recommends --fix-missing \
     build-essential \
     ca-certificates \
+    curl \
+    gnupg \
     tzdata \
     locales \
     git \

diff --git a/example/client/go.mod b/example/client/go.mod
@@ -16,7 +16,7 @@ replace (
 	google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28
 	google.golang.org/grpc => google.golang.org/grpc v1.68.0
 	google.golang.org/protobuf => google.golang.org/protobuf v1.35.1
-	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
+	sigs.k8s.io/yaml => sigs.k8s.io/yaml v2.4.0
 	gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
 )
 

diff --git a/example/client/go.mod.default b/example/client/go.mod.default
@@ -16,6 +16,6 @@ replace (
 	google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc latest
 	google.golang.org/grpc => google.golang.org/grpc latest
 	google.golang.org/protobuf => google.golang.org/protobuf latest
-	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 latest
+	sigs.k8s.io/yaml => sigs.k8s.io/yaml latest
 	gopkg.in/yaml.v3 => gopkg.in/yaml.v3 latest
 )
diff --git a/go.mod b/go.mod
@@ -326,7 +326,7 @@ replace (
 	gopkg.in/inconshreveable/log15.v2 => gopkg.in/inconshreveable/log15.v2 v2.16.0
 	gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1
 	gopkg.in/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
-	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
+	sigs.k8s.io/yaml => sigs.k8s.io/yaml v2.4.0
 	gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
 	honnef.co/go/tools => honnef.co/go/tools v0.5.1
 	k8s.io/api => k8s.io/api v0.31.2
@@ -411,7 +411,7 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28
 	google.golang.org/grpc v1.68.0
 	google.golang.org/protobuf v1.35.1
-	gopkg.in/yaml.v2 v2.4.0
+	sigs.k8s.io/yaml v2.4.0
 	k8s.io/api v0.31.2
 	k8s.io/apimachinery v0.31.2
 	k8s.io/cli-runtime v0.0.0-00010101000000-000000000000

diff --git a/go.sum b/go.sum
@@ -795,8 +795,8 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+sigs.k8s.io/yaml v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+sigs.k8s.io/yaml v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=

diff --git a/hack/actions/gen/main.go b/hack/actions/gen/main.go
@@ -33,7 +33,7 @@ import (
 	"github.com/vdaas/vald/internal/safety"
 	"github.com/vdaas/vald/internal/strings"
 	"github.com/vdaas/vald/internal/sync/errgroup"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 )
 
 var license string = `#
@@ -166,10 +166,10 @@ const (
 var (
 	clangBuildDeps = []string{
 		"cmake",
-		"gcc",
 		"g++",
-		"unzip",
+		"gcc",
 		"libssl-dev",
+		"unzip",
 	}
 	ngtBuildDeps = []string{
 		"liblapack-dev",
@@ -184,8 +184,8 @@ var (
 		"gnupg2",
 		"graphviz",
 		"jq",
-		"libhdf5-dev",
 		"libaec-dev",
+		"libhdf5-dev",
 		"sed",
 		"zip",
 	}
@@ -204,13 +204,12 @@ var (
 		"make kind/install",
 		"make kubectl/install",
 		"make kubelinter/install",
-		"make reviewdog/install",
-		"make tparse/install",
-		"make valdcli/install",
-		"make yq/install",
 		"make minikube/install",
+		"make reviewdog/install",
 		"make stern/install",
 		"make telepresence/install",
+		"make tparse/install",
+		"make yq/install",
 	}
 
 	devContainerPreprocess = []string{
@@ -720,7 +719,7 @@ func main() {
 				return fmt.Errorf("error marshaling workflowStruct to YAML: %w", err)
 			}
 
-			// remove the double quotation marks from the generated key "on": (note that the word "on" is a reserved word in gopkg.in/yaml.v2)
+			// remove the double quotation marks from the generated key "on": (note that the word "on" is a reserved word in sigs.k8s.io/yaml)
 			workflowYaml := strings.Replace(string(workflowYamlTmp), "\"on\":", "on:", 1)
 
 			buf := bytes.NewBuffer(make([]byte, 0, len(license)+len(workflowYaml)))