11 Star 1 Fork 10

src-openEuler/eggo

加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0008-fix-post-join-hook-do-not-run-bug.patch 1.45 KB
一键复制 编辑 原始数据 按行查看 历史
zhangxiaoyu 提交于 2021-11-26 09:39 . upgrade to v0.9.4-2
From 8499061627913792f96748e6aaf9cac6f9e9f025 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Mon, 8 Nov 2021 06:50:38 +0000
Subject: [PATCH 08/12] fix post join hook do not run bug
Signed-off-by: haozi007 <liuhao27@huawei.com>
---
pkg/clusterdeployment/clusterdeploy.go | 2 +-
pkg/utils/dependency/install.go | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkg/clusterdeployment/clusterdeploy.go b/pkg/clusterdeployment/clusterdeploy.go
index 27167c4..d8941ee 100644
--- a/pkg/clusterdeployment/clusterdeploy.go
+++ b/pkg/clusterdeployment/clusterdeploy.go
@@ -191,7 +191,7 @@ func doCreateCluster(handler api.ClusterDeploymentAPI, cc *api.ClusterConfig, cs
approveServingCsr(cc, append(joinedNodes, controlPlaneNode))
// Step9: run postcreate cluster hooks
- if err = handler.PostCreateClusterHooks(joinedNodes); err != nil {
+ if err = handler.PostCreateClusterHooks(cc.Nodes); err != nil {
return nil, err
}
diff --git a/pkg/utils/dependency/install.go b/pkg/utils/dependency/install.go
index e2c0621..8687602 100644
--- a/pkg/utils/dependency/install.go
+++ b/pkg/utils/dependency/install.go
@@ -354,6 +354,7 @@ func ExecuteShell(roleInfra *api.RoleInfra, packagePath string, hcf *api.HostCon
if len(shell) == 0 {
return nil
}
+ logrus.Debugf("run %s shell %v on %v\n", string(schedule), shell, hcf.Address)
dp := &dependencyShell{
srcPath: path.Join(packagePath, constants.DefaultFilePath),
--
2.25.1
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/src-openeuler/eggo.git
git@gitee.com:src-openeuler/eggo.git
src-openeuler
eggo
eggo
master

搜索帮助