vdaas · vankichi · Apr 25, 2024 · Apr 22, 2024 · Apr 22, 2024 · Apr 24, 2024
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,6 +23,7 @@ assignees: ""
 <!--- Please change the versions below along with your environment -->
 
 - Go Version: 1.22.2
+- Rust Version: 1.77.2
 - Docker Version: 20.10.8
 - Kubernetes Version: v1.29.3
 - NGT Version: 2.2
diff --git a/.github/ISSUE_TEMPLATE/security_issue_report.md b/.github/ISSUE_TEMPLATE/security_issue_report.md
@@ -17,6 +17,7 @@ assignees: ""
 <!--- Please change the versions below along with your environment -->
 
 - Go Version: 1.22.2
+- Rust Version: 1.77.2
 - Docker Version: 20.10.8
 - Kubernetes Version: v1.29.3
 - NGT Version: 2.2
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,6 +17,7 @@
 <!--- Please change the versions below along with your environment -->
 
 - Go Version: 1.22.2
+- Rust Version: 1.77.2
 - Docker Version: 20.10.8
 - Kubernetes Version: v1.29.3
 - NGT Version: 2.2

diff --git a/.github/workflows/update-pull-request-and-issue-template.yml b/.github/workflows/update-pull-request-and-issue-template.yml
@@ -22,6 +22,7 @@ on:
       - "versions/GO_VERSION"
       - "versions/NGT_VERSION"
       - "versions/KUBECTL_VERSION"
+      - "versions/RUST_VERSION"
 jobs:
   dump-contexts-to-log:
     runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -59,9 +59,10 @@ GO_CLEAN_DEPS := true
 GOTEST_TIMEOUT = 30m
 CGO_ENABLED = 1
 
-RUST_HOME = /usr/local/lib/rust
-RUSTUP_HOME = $(RUST_HOME)/rustup
-CARGO_HOME = $(RUST_HOME)/cargo
+RUST_HOME ?= /usr/local/lib/rust
+RUSTUP_HOME ?= $(RUST_HOME)/rustup
+CARGO_HOME ?= $(RUST_HOME)/cargo
+RUST_VERSION := $(eval RUST_VERSION := $(shell cat versions/RUST_VERSION))$(RUST_VERSION)
 
 NPM_GLOBAL_PREFIX := $(eval NPM_GLOBAL_PREFIX := $(shell npm prefix --location=global))$(NPM_GLOBAL_PREFIX)
 
@@ -539,6 +540,11 @@ version/vald:
 version/go:
 	@echo $(GO_VERSION)
 
+.PHONY: version/rust
+## print rust version
+version/rust:
+	@echo $(RUST_VERSION)
+
 .PHONY: version/ngt
 ## print NGT version
 version/ngt:

diff --git a/Makefile.d/dependencies.mk b/Makefile.d/dependencies.mk
@@ -85,15 +85,8 @@ go/example/deps:
 ## install Rust package dependencies
 rust/deps: \
 	rust/install
-	if [ -x "$(CARGO_HOME)/bin/cargo" ]; then \
-		cd $(ROOTDIR)/rust \
-			&& $(CARGO_HOME)/bin/rustup default stable \
-			&& $(CARGO_HOME)/bin/cargo update \
-			&& cd -;\
-	else \
-		echo "Cargo not found. Please install Cargo or add it to your PATH."; \
-		exit 1; \
-	fi
+	sed -i "2s/channel = \"[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\"/channel = \"$(RUST_VERSION)\"/g" $(ROOTDIR)/rust/rust-toolchain.toml
+	cd $(ROOTDIR)/rust && $(CARGO_HOME)/bin/cargo update && cd -
 
 .PHONY: update/chaos-mesh
 ## update chaos-mesh version
@@ -122,6 +115,11 @@ update/go:
 update/golangci-lint:
 	curl --silent https://api.github.com/repos/golangci/golangci-lint/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/GOLANGCILINT_VERSION
 
+.PHONY: update/rust
+## update rust version
+update/rust:
+	curl --silent https://releases.rs | grep -Po 'Stable: \K[\d.]+\s' | head -n 1 > $(ROOTDIR)/versions/RUST_VERSION
+
 .PHONY: update/helm
 ## update helm version
 update/helm:
@@ -223,6 +221,7 @@ update/template:
 	$(eval GO_VERSION      := $(shell $(MAKE) -s version/go))
 	$(eval NGT_VERSION     := $(shell $(MAKE) -s version/ngt))
 	$(eval KUBECTL_VERSION := $(shell $(MAKE) -s version/k8s))
+	$(eval RUST_VERSION    := $(shell $(MAKE) -s version/rust))
 	sed -i -e "s/^- Go Version: .*$$/- Go Version: $(GO_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/bug_report.md
 	sed -i -e "s/^- Go Version: .*$$/- Go Version: $(GO_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/security_issue_report.md
 	sed -i -e "s/^- Go Version: .*$$/- Go Version: $(GO_VERSION)/" $(ROOTDIR)/.github/PULL_REQUEST_TEMPLATE.md
@@ -234,3 +233,7 @@ update/template:
 	sed -i -e "s/^- Kubernetes Version: .*$$/- Kubernetes Version: $(KUBECTL_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/bug_report.md
 	sed -i -e "s/^- Kubernetes Version: .*$$/- Kubernetes Version: $(KUBECTL_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/security_issue_report.md
 	sed -i -e "s/^- Kubernetes Version: .*$$/- Kubernetes Version: $(KUBECTL_VERSION)/" $(ROOTDIR)/.github/PULL_REQUEST_TEMPLATE.md
+
+	sed -i -e "s/^- Rust Version: .*$$/- Rust Version: $(RUST_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/bug_report.md
+	sed -i -e "s/^- Rust Version: .*$$/- Rust Version: $(RUST_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/security_issue_report.md
+	sed -i -e "s/^- Rust Version: .*$$/- Rust Version: $(RUST_VERSION)/" $(ROOTDIR)/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk
@@ -117,6 +117,7 @@ docker/build/agent:
 	@make DOCKERFILE="$(ROOTDIR)/dockers/agent/core/agent/Dockerfile" \
 		IMAGE=$(AGENT_IMAGE) \
 		DISTROLESS_IMAGE=gcr.io/distroless/cc-debian12 \
+		EXTRA_ARGS="--build-arg RUST_VERSION=$(RUST_VERSION)" \
 		docker/build/image
 
 .PHONY: docker/name/discoverer-k8s

diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk
@@ -162,11 +162,5 @@ $(GOROOT)/bin/go:
 rust/install: $(CARGO_HOME)/bin/cargo
 
 $(CARGO_HOME)/bin/cargo:
-	curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} sh -s -- --default-toolchain nightly -y
-	source "${CARGO_HOME}/env" \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup install stable \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup install beta \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup install nightly \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup toolchain install nightly \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup default nightly \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup update
+	curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} sh -s -- --default-toolchain $(RUST_VERSION) -y
+	source "${CARGO_HOME}/env"
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2019-2024 vdaas.org vald team <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+[toolchain]
+channel = "1.77.2"
diff --git a/versions/RUST_VERSION b/versions/RUST_VERSION
@@ -0,0 +1 @@
+1.77.2