Merge pull request #1 from superproj/master

修复 onex.sh 中 grep 模式关键字匹配失败问题

Author: OpenCreate

internal/usercenter/biz/user/user.go

@@ -15,7 +15,7 @@ import (
 	v1 "github.com/superproj/onex/pkg/api/usercenter/v1"
 )
 
-// UserBiz defines methods used to handle user rquest.
+// UserBiz defines methods used to handle user request.
 type UserBiz interface {
 	Create(ctx context.Context, rq *v1.CreateUserRequest) (*v1.UserReply, error)
 	List(ctx context.Context, rq *v1.ListUserRequest) (*v1.ListUserResponse, error)

scripts/installation/mongo.sh

@@ -44,8 +44,11 @@ onex::mongo::docker::install()
 
 onex::mongo::pre_install()
 {
+  # 获取 MongoDB 公钥
+  echo ${LINUX_PASSWORD} | sudo -S wget -qO - https://www.mongodb.org/static/pgp/server-7.0.asc | sudo apt-key add -
+
   # 添加 MongoDB APT 源
-  echo ${LINUX_PASSWORD} | sudo -S echo "deb [arch=amd64,arm64] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/7.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list
+  echo ${LINUX_PASSWORD} | sudo -S echo "deb [arch=amd64,arm64] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/7.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list
 
   # 安装libssl1.1，否则安装 mongo 时会报以下错误：
   # mongodb-org-mongos : Depends: libssl1.1 (>= 1.1.1) but it is not installable
@@ -74,9 +77,6 @@ onex::mongo::sbs::install()
 
   echo ${LINUX_PASSWORD} | sudo -S apt install -y gnupg
 
-  # 获取 MongoDB 公钥
-  echo ${LINUX_PASSWORD} | sudo -S wget -qO - https://www.mongodb.org/static/pgp/server-7.0.asc | sudo apt-key add -
-
   # 安装 MongoDB 服务端
   # 以为我们uninstall时会删除配置文件，所以要使用--force-confmiss 重新安装配置文件
   onex::util::sudo "apt -y -o Dpkg::Options::="--force-confmiss" --reinstall install mongodb-org mongodb-org-server"

scripts/make-rules/tools.mk

@@ -173,7 +173,7 @@ _install.kubeconform: ## Install kubeconform command line tool.
 
 .PHONY: _install.kubectl
 _install.kubectl: ## Install kubectl command line tool.
-	@curl --create-dirs -L -o $$HOME/bin/kubectl "https://dl.k8s.io/release/$(shell curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+	@curl --create-dirs -L -o $$HOME/bin/kubectl "https://dl.k8s.io/release/$(shell curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(shell $(GO) env GOHOSTARCH)/kubectl"
 	@chmod +x $$HOME/bin/kubectl
 	@$(SCRIPTS_DIR)/add-completion.sh kubectl bash