zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Agent][Deploy] - add zjyd

Browse Source
This commit is contained in:
zeaslity
2024-08-20 09:35:32 +08:00
parent 1828116d8a
commit 40b540f082
252 changed files with 21873 additions and 25482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
agent-operator/CmiiK8sOperator.go
View File

@@ -11,14 +11,14 @@ import (
)
var DefaultCmiiOperator = CmiiK8sOperator{}
var updateLogPath = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/log/cmii-update-log.txt"
var UpdateLogPath = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/log/cmii-update-log.txt"
func init() {
switch runtime.GOOS {
case "linux":
updateLogPath = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/log/cmii-update-log.txt"
UpdateLogPath = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/log/cmii-update-log.txt"
case "windows":
updateLogPath = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-operator\\log\\cmii-update-log.txt"
UpdateLogPath = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-operator\\log\\cmii-update-log.txt"
}
}
@@ -303,11 +303,12 @@ func UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag string) (updateOK boo
if cmiiDeploymentInterface == nil {
return updateOK, oldImageTag, newImageTag
}
// check if need to update
oldImageTag = cmiiDeploymentInterface.ImageTag
if oldImageTag == newTag {
log.DebugF("[UpdateCmiiDeploymentImageTag] - [%s] [%s] image tag are the same ! no need to update !", cmiiEnv, appName)
// restart
// restart deployment
if DefaultCmiiOperator.DeploymentRestart(cmiiEnv, appName) {
return true, oldImageTag, oldImageTag
} else {
@@ -329,8 +330,8 @@ func UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag string) (updateOK boo
return false, oldImageTag, newImageTag
}
// append log
utils.AppendContentToFile(content, updateLogPath)
// append update log
utils.AppendContentToFile(content, UpdateLogPath)
// re-get from env
time.Sleep(time.Second)
@@ -340,6 +341,7 @@ func UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag string) (updateOK boo
return false, oldImageTag, newImageTag
}
// result
return true, oldImageTag, deploy.ImageTag
}
@@ -377,7 +379,7 @@ func UpdateCmiiImageTagFromNameTagList(cmiiEnv string, nameTagList []string) (re
func RollBackCmiiDeploymentFromUpdateLog(updateLog string) bool {
//if !executor.BasicFindContentInFile(updateLog, updateLogPath) {
//if !executor.BasicFindContentInFile(updateLog, UpdateLogPath) {
// log.ErrorF("[RollBackCmiiDeploymentFromUpdateLog] - [%s] no this update log ! use update instead ! => ", updateLog)
// return false
//}
@@ -734,6 +736,7 @@ func FilterAllCmiiNodeSoft(nodeList []CmiiNodeInterface) (result []CmiiNodeInter
return result
}
// AppNameBelongsToCmiiImage 根据CmiiBackendAppMap CmiiFrontendAppMap判断一个appName是否属于CMII
func AppNameBelongsToCmiiImage(appName string) bool {
_, ok := d_app.CmiiBackendAppMap[appName]
if !ok {