diff --git a/agent-go/executor/AppFunction.go b/agent-go/executor/AppFunction.go index a35182c..de3023d 100644 --- a/agent-go/executor/AppFunction.go +++ b/agent-go/executor/AppFunction.go @@ -158,7 +158,7 @@ func (op *AgentOsOperator) deployRke(funcArgs []string) (bool, []string) { "[deployRke] - ip args error !", } } - if !BasicReplace("/root/wdd/rke-cluster.yml", "A1C2IP", funcArgs[1]) { + if !BasicReplace("/root/wdd/rke-cluster.yml", "A1C2IP", funcArgs[0]) { log.ErrorF("[deployRke] - rke config replace error !") } diff --git a/agent-go/executor/K8sFunction.go b/agent-go/executor/K8sFunction.go index 9b140f0..c77d01f 100644 --- a/agent-go/executor/K8sFunction.go +++ b/agent-go/executor/K8sFunction.go @@ -241,15 +241,15 @@ func KubectlDeleteExec(resourcesYamlFile string) (bool, []string) { func K8sCreateNamespace(namespaceName string) bool { if k8sClient == nil { - log.ErrorF("k8s client is nil, run k8s function error !") - return false + // this should be the first call of k8s function + k8sClient = newK8sClientInstance() + if k8sClient == nil { + log.ErrorF("k8s client is nil, run k8s function error !") + return false + } } - namespace, err := k8sClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) - if err != nil { - log.ErrorF("Error getting namespace: %s ", err.Error()) - return false - } + namespace, _ := k8sClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) if namespace != nil { log.InfoF("[K8sCreateNamespace] - namespace of [%s] already exists!", namespaceName) return true @@ -263,6 +263,7 @@ func K8sCreateNamespace(namespaceName string) bool { }, } // 使用客户端创建命名空间 + var err error namespace, err = k8sClient.CoreV1().Namespaces().Create(context.TODO(), namespace, metav1.CreateOptions{}) if err != nil { log.ErrorF("Error getting namespace: %s ", err.Error()) diff --git a/agent-go/executor/MySqlFunction.go b/agent-go/executor/MySqlFunction.go index 2835064..0c97ff8 100644 --- a/agent-go/executor/MySqlFunction.go +++ b/agent-go/executor/MySqlFunction.go @@ -78,7 +78,6 @@ func MysqlSqlFileLoad(jackeyLoveIp string, jackeyLoveFileList []string) (bool, [ executeError, } } - log.DebugF("[MysqlSqlFileLoad] - jackeyLoveFile %s execute success !", jackeyLove.Name()) } diff --git a/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java index 694d21b..1f26c2f 100644 --- a/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java @@ -99,11 +99,11 @@ public class AppFuncScheduler { List appFunctionEnumList = List.of( // AppFunctionEnum.DEPLOY_RKE // AppFunctionEnum.DEPLOY_TEST_NFS -// AppFunctionEnum.DEPLOY_K8S_NAMESPACE, -// AppFunctionEnum.DEPLOY_K8S_MYSQL + AppFunctionEnum.DEPLOY_K8S_NAMESPACE, + AppFunctionEnum.DEPLOY_K8S_MYSQL // AppFunctionEnum.DEPLOY_K8S_REDIS // AppFunctionEnum.DEPLOY_K8S_PVC - AppFunctionEnum.LOAD_MYSQL_INIT_SCRIPT +// AppFunctionEnum.LOAD_MYSQL_INIT_SCRIPT ); diff --git a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java index ad19621..52ef3ee 100644 --- a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java @@ -95,11 +95,12 @@ public class BaseFuncScheduler { List masterNodeProcedureList = List.of( -// BaseFunctionEnum.DISABLE_SWAP, -// BaseFunctionEnum.SHUTDOWN_FIREWALL, -// BaseFunctionEnum.INSTALL_CHRONY, -// BaseFunctionEnum.CHRONY_TO_PUBLIC_NTP, -// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, + BaseFunctionEnum.DISABLE_SWAP, + BaseFunctionEnum.SHUTDOWN_FIREWALL, + BaseFunctionEnum.INSTALL_CHRONY, + BaseFunctionEnum.CHRONY_TO_PUBLIC_NTP, + BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, + BaseFunctionEnum.MODIFY_DOCKER_CONFIG // BaseFunctionEnum.INSTALL_HARBOR, // BaseFunctionEnum.INSTALL_ZSH @@ -131,10 +132,10 @@ public class BaseFuncScheduler { } List masterNodeDurationTaskList = List.of( - BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE -// BaseFunctionEnum.INSTALL_DOCKER, -// BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, -// BaseFunctionEnum.INSTALL_HARBOR + BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE, + BaseFunctionEnum.INSTALL_DOCKER, + BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, + BaseFunctionEnum.INSTALL_HARBOR ); for (BaseFunctionEnum durationBaseFunc : masterNodeDurationTaskList) { diff --git a/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java index 5a5f53d..f57c29a 100644 --- a/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java @@ -55,15 +55,15 @@ public class HarborFuncScheduler { .getTopicName(); // create harbor project -// if (!CreateHarborProject(projectDeployContext)) { -// log.error("create harbor project failed !"); -// } + if (!CreateHarborProject(projectDeployContext)) { + log.error("create harbor project failed !"); + } // check harbor project // list -// if (!ListHarborProject(projectDeployContext)) { -// log.error("list harbor project failed !"); -// } + if (!ListHarborProject(projectDeployContext)) { + log.error("list harbor project failed !"); + } int maxSyncStatusCheckCount = 1000; int timePinch = 2;