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

[agent-operator]-无聊的更新内容

Browse Source
This commit is contained in:
zeaslity
2024-12-02 18:04:13 +08:00
parent 88cb1e1bb1
commit 8f5f85826c
70 changed files with 45926 additions and 34521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-deploy/OctopusDeploy.go
View File

@@ -180,7 +180,7 @@ func CmiiEnvironmentDeploy(isCompleteDeploy bool, commonEnv *z_dep.CommonEnviron
_ = os.Mkdir(oldApplyFileFolder, os.ModePerm)
// move all apply file to old folder
_ = utils.FolderMoveFiles(commonEnv.ApplyFilePrefix, oldApplyFileFolder)
_ = utils.MoveFolerToAnother(commonEnv.ApplyFilePrefix, oldApplyFileFolder)
// get cmii env config from namespace
cmiiEnvConfig := getCmiiEnvConfigurationFromNamespace(commonEnv.Namespace)

62
agent-deploy/d_app/CmiiImageConfig.go
View File

@@ -46,39 +46,41 @@ var CmiiBackendAppMap = map[string]string{
"cmii-uav-sense-adapter": "5.4.0",
"cmii-uav-sync": "5.4.0",
"cmii-uav-iot-dispatcher": "5.7.0",
"uavms-security-center": "5.7.0",
"cmii-uavms-security-center": "5.7.0",
"cmii-uav-fwdd": "5.7.0",
}
var CmiiFrontendAppMap = map[string]string{
"cmii-suav-platform-supervision": "5.2.0",
"cmii-suav-platform-supervisionh5": "5.2.0",
"cmii-uav-platform": "5.2.0-011004",
"cmii-uav-platform-ai-brain": "5.2.0",
"cmii-uav-platform-armypeople": "5.2.0-24538",
"cmii-uav-platform-base": "5.2.0",
"cmii-uav-platform-cms-portal": "5.2.0",
"cmii-uav-platform-detection": "5.2.0",
"cmii-uav-platform-emergency-rescue": "5.2.0",
"cmii-uav-platform-hljtt": "5.2.0",
"cmii-uav-platform-jiangsuwenlv": "4.1.3-jiangsu-0427",
"cmii-uav-platform-logistics": "5.2.0",
"cmii-uav-platform-media": "5.2.0",
"cmii-uav-platform-multiterminal": "5.2.0",
"cmii-uav-platform-mws": "5.2.0",
"cmii-uav-platform-oms": "5.2.0",
"cmii-uav-platform-open": "5.2.0",
"cmii-uav-platform-qingdao": "4.1.6-24238-qingdao",
"cmii-uav-platform-qinghaitourism": "4.1.0-21377-0508",
"cmii-uav-platform-security": "4.1.6",
"cmii-uav-platform-securityh5": "5.2.0",
"cmii-uav-platform-seniclive": "5.2.0",
"cmii-uav-platform-share": "5.2.0",
"cmii-uav-platform-splice": "5.2.0",
"cmii-uav-platform-threedsimulation": "5.2.0-21392",
"cmii-uav-platform-visualization": "5.2.0",
"cmii-uav-platform-uasms": "5.2.0",
"cmii-uav-platform-uas": "5.2.0",
"cmii-uav-platform-pilot2-to-cloud": "5.2.0",
"cmii-suav-platform-supervision": "5.2.0",
"cmii-suav-platform-supervisionh5": "5.2.0",
"cmii-uav-platform": "5.2.0-011004",
"cmii-uav-platform-ai-brain": "5.2.0",
"cmii-uav-platform-armypeople": "5.2.0-24538",
"cmii-uav-platform-base": "5.2.0",
"cmii-uav-platform-cms-portal": "5.2.0",
"cmii-uav-platform-detection": "5.2.0",
"cmii-uav-platform-emergency-rescue": "5.2.0",
"cmii-uav-platform-hljtt": "5.2.0",
"cmii-uav-platform-jiangsuwenlv": "4.1.3-jiangsu-0427",
"cmii-uav-platform-logistics": "5.2.0",
"cmii-uav-platform-media": "5.2.0",
"cmii-uav-platform-multiterminal": "5.2.0",
"cmii-uav-platform-mws": "5.2.0",
"cmii-uav-platform-oms": "5.2.0",
"cmii-uav-platform-open": "5.2.0",
"cmii-uav-platform-qingdao": "4.1.6-24238-qingdao",
"cmii-uav-platform-qinghaitourism": "4.1.0-21377-0508",
"cmii-uav-platform-security": "4.1.6",
"cmii-uav-platform-securityh5": "5.2.0",
"cmii-uav-platform-seniclive": "5.2.0",
"cmii-uav-platform-share": "5.2.0",
"cmii-uav-platform-splice": "5.2.0",
"cmii-uav-platform-threedsimulation": "5.2.0-21392",
"cmii-uav-platform-visualization": "5.2.0",
"cmii-uav-platform-uasms": "5.2.0",
"cmii-uav-platform-uas": "5.2.0",
"cmii-uav-platform-pilot2-to-cloud": "5.2.0",
"cmii-uavms-platform-security-center": "5.2.0",
}
var IgnoreCmiiBackendAppName = map[string]string{

156
agent-deploy/d_app/FrontendConfigMap.go
View File

@@ -1,81 +1,89 @@
package d_app
var FrontendShortNameMaps = map[string]string{
"cmii-suav-platform-supervision": "supervision",
"cmii-suav-platform-supervisionh5": "supervisionh5",
"cmii-uav-platform": "pangu",
"cmii-uav-platform-ai-brain": "ai-brain",
"cmii-uav-platform-armypeople": "armypeople",
"cmii-uav-platform-base": "base",
"cmii-uav-platform-cms-portal": "cmsportal",
"cmii-uav-platform-detection": "detection",
"cmii-uav-platform-emergency-rescue": "emergency",
"cmii-uav-platform-logistics": "logistics",
"cmii-uav-platform-media": "media",
"cmii-uav-platform-multiterminal": "multiterminal",
"cmii-uav-platform-mws": "mws",
"cmii-uav-platform-oms": "oms",
"cmii-uav-platform-open": "open",
"cmii-uav-platform-security": "security",
"cmii-uav-platform-securityh5": "securityh5",
"cmii-uav-platform-seniclive": "seniclive",
"cmii-uav-platform-share": "share",
"cmii-uav-platform-splice": "splice",
"cmii-uav-platform-traffic": "traffic",
"cmii-uav-platform-threedsimulation": "threedsimulation",
"cmii-uav-platform-jiangsuwenlv": "jiangsuwenlv",
"cmii-uav-platform-qinghaitourism": "qinghaitourism",
"cmii-uav-platform-qingdao": "qingdao",
"cmii-uav-platform-hljtt": "hljtt",
"cmii-uav-platform-visualization": "visualization",
"cmii-uav-platform-uasms": "uasms",
"cmii-uav-platform-uas": "uas",
"cmii-uav-platform-dispatchh5": "dispatchh5",
"cmii-uav-platform-pilot2-to-cloud": "pilot2cloud",
"cmii-uav-platform-hyperspectral": "hyper",
"cmii-uav-platform-scanner": "scanner",
"cmii-uav-platform-blockchain": "blockchain",
"cmii-uav-platform-smsecret": "smsecret",
"cmii-uav-platform-classification": "classification",
"cmii-uav-platform-smauth": "smauth",
"cmii-suav-platform-supervision": "supervision",
"cmii-suav-platform-supervisionh5": "supervisionh5",
"cmii-uav-platform": "pangu",
"cmii-uav-platform-ai-brain": "ai-brain",
"cmii-uav-platform-armypeople": "armypeople",
"cmii-uav-platform-base": "base",
"cmii-uav-platform-cms-portal": "cmsportal",
"cmii-uav-platform-detection": "detection",
"cmii-uav-platform-emergency-rescue": "emergency",
"cmii-uav-platform-logistics": "logistics",
"cmii-uav-platform-media": "media",
"cmii-uav-platform-multiterminal": "multiterminal",
"cmii-uav-platform-mws": "mws",
"cmii-uav-platform-oms": "oms",
"cmii-uav-platform-open": "open",
"cmii-uav-platform-security": "security",
"cmii-uav-platform-securityh5": "securityh5",
"cmii-uav-platform-seniclive": "seniclive",
"cmii-uav-platform-share": "share",
"cmii-uav-platform-splice": "splice",
"cmii-uav-platform-traffic": "traffic",
"cmii-uav-platform-threedsimulation": "threedsimulation",
"cmii-uav-platform-jiangsuwenlv": "jiangsuwenlv",
"cmii-uav-platform-qinghaitourism": "qinghaitourism",
"cmii-uav-platform-qingdao": "qingdao",
"cmii-uav-platform-hljtt": "hljtt",
"cmii-uav-platform-visualization": "visualization",
"cmii-uav-platform-uasms": "uasms",
"cmii-uav-platform-uas": "uas",
"cmii-uav-platform-dispatchh5": "dispatchh5",
"cmii-uav-platform-pilot2-to-cloud": "pilot2cloud",
"cmii-uav-platform-hyperspectral": "hyper",
"cmii-uav-platform-scanner": "scanner",
"cmii-uav-platform-blockchain": "blockchain",
"cmii-uav-platform-smsecret": "smsecret",
"cmii-uav-platform-classification": "classification",
"cmii-uav-platform-smauth": "smauth",
"cmii-uavms-platform-security-center": "secenter",
"cmii-uav-platform-eventsh5": "eventsh5",
"cmii-uav-platform-mianyangbackend": "mianyangbackend",
"cmii-uav-platform-dikongzhixingh5": "dikongzhixingh5",
}
var FrontendClientIdMaps = map[string]string{
"cmii-suav-platform-supervision": "APP_qqSu82THfexI8PLM",
"cmii-suav-platform-supervisionh5": "APP_qqSu82THfexI8PLM",
"cmii-uav-platform": "empty",
"cmii-uav-platform-ai-brain": "APP_rafnuCAmBESIVYMH",
"cmii-uav-platform-armypeople": "APP_UIegse6Lfou9pO1U",
"cmii-uav-platform-base": "APP_9LY41OaKSqk2btY0",
"cmii-uav-platform-cms-portal": "empty",
"cmii-uav-platform-detection": "APP_FDHW2VLVDWPnnOCy",
"cmii-uav-platform-emergency-rescue": "APP_aGsTAY1uMZrpKdfk",
"cmii-uav-platform-logistics": "APP_PvdfRRRBPL8xbIwl",
"cmii-uav-platform-media": "APP_4AU8lbifESQO4FD6",
"cmii-uav-platform-multiterminal": "APP_PvdfRRRBPL8xbIwl",
"cmii-uav-platform-mws": "APP_uKniXPELlRERBBwK",
"cmii-uav-platform-oms": "empty",
"cmii-uav-platform-open": "empty",
"cmii-uav-platform-qingdao": "empty",
"cmii-uav-platform-qinghaitourism": "empty",
"cmii-uav-platform-security": "APP_JUSEMc7afyWXxvE7",
"cmii-uav-platform-securityh5": "APP_N3ImO0Ubfu9peRHD",
"cmii-uav-platform-seniclive": "empty",
"cmii-uav-platform-share": "APP_4lVSVI0ZGxTssir8",
"cmii-uav-platform-splice": "APP_zE0M3sTRXrCIJS8Y",
"cmii-uav-platform-threedsimulation": "empty",
"cmii-uav-platform-visualization": "empty",
"cmii-uav-platform-traffic": "APP_Jc8i2wOQ1t73QEJS",
"cmii-uav-platform-jiangsuwenlv": "empty",
"cmii-uav-platform-hljtt": "empty",
"cmii-uav-platform-uasms": "empty",
"cmii-uav-platform-uas": "empty",
"cmii-uav-platform-dispatchh5": "empty",
"cmii-uav-platform-pilot2-to-cloud": "empty",
"cmii-uav-platform-hyperspectral": "empty",
"cmii-uav-platform-scanner": "empty",
"cmii-uav-platform-blockchain": "empty",
"cmii-uav-platform-smsecret": "empty",
"cmii-uav-platform-classification": "empty",
"cmii-uav-platform-smauth": "empty",
"cmii-suav-platform-supervision": "APP_qqSu82THfexI8PLM",
"cmii-suav-platform-supervisionh5": "APP_qqSu82THfexI8PLM",
"cmii-uav-platform": "empty",
"cmii-uav-platform-ai-brain": "APP_rafnuCAmBESIVYMH",
"cmii-uav-platform-armypeople": "APP_UIegse6Lfou9pO1U",
"cmii-uav-platform-base": "APP_9LY41OaKSqk2btY0",
"cmii-uav-platform-cms-portal": "empty",
"cmii-uav-platform-detection": "APP_FDHW2VLVDWPnnOCy",
"cmii-uav-platform-emergency-rescue": "APP_aGsTAY1uMZrpKdfk",
"cmii-uav-platform-logistics": "APP_PvdfRRRBPL8xbIwl",
"cmii-uav-platform-media": "APP_4AU8lbifESQO4FD6",
"cmii-uav-platform-multiterminal": "APP_PvdfRRRBPL8xbIwl",
"cmii-uav-platform-mws": "APP_uKniXPELlRERBBwK",
"cmii-uav-platform-oms": "empty",
"cmii-uav-platform-open": "empty",
"cmii-uav-platform-qingdao": "empty",
"cmii-uav-platform-qinghaitourism": "empty",
"cmii-uav-platform-security": "APP_JUSEMc7afyWXxvE7",
"cmii-uav-platform-securityh5": "APP_N3ImO0Ubfu9peRHD",
"cmii-uav-platform-seniclive": "empty",
"cmii-uav-platform-share": "APP_4lVSVI0ZGxTssir8",
"cmii-uav-platform-splice": "APP_zE0M3sTRXrCIJS8Y",
"cmii-uav-platform-threedsimulation": "empty",
"cmii-uav-platform-visualization": "empty",
"cmii-uav-platform-traffic": "APP_Jc8i2wOQ1t73QEJS",
"cmii-uav-platform-jiangsuwenlv": "empty",
"cmii-uav-platform-hljtt": "empty",
"cmii-uav-platform-uasms": "empty",
"cmii-uav-platform-uas": "empty",
"cmii-uav-platform-dispatchh5": "empty",
"cmii-uav-platform-pilot2-to-cloud": "empty",
"cmii-uav-platform-hyperspectral": "empty",
"cmii-uav-platform-scanner": "empty",
"cmii-uav-platform-blockchain": "empty",
"cmii-uav-platform-smsecret": "empty",
"cmii-uav-platform-classification": "empty",
"cmii-uav-platform-smauth": "empty",
"cmii-uavms-platform-security-center": "empty",
"cmii-uav-platform-eventsh5": "empty",
"cmii-uav-platform-mianyangbackend": "empty",
"cmii-uav-platform-dikongzhixingh5": "empty",
}

2
agent-deploy/z_dep/G.go
View File

@@ -129,7 +129,7 @@ func ParseEnvToApplyFile(environment any, applyTemplate string, applyFilePath st
}
// append to file
if !utils.AppendContentWithSplitLineToFile(result.String(), applyFilePath) {
if !utils.AppendK8sYamlWithSplitLineToFile(result.String(), applyFilePath) {
return false
}