[ Agent ] [ App ] - fix some bugs
This commit is contained in:
@@ -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 !")
|
||||
}
|
||||
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -78,7 +78,6 @@ func MysqlSqlFileLoad(jackeyLoveIp string, jackeyLoveFileList []string) (bool, [
|
||||
executeError,
|
||||
}
|
||||
}
|
||||
|
||||
log.DebugF("[MysqlSqlFileLoad] - jackeyLoveFile %s execute success !", jackeyLove.Name())
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user