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

[Agent][Deploy] - fix deploy bugs

Browse Source
This commit is contained in:
zeaslity
2024-07-17 10:10:31 +08:00
parent 408bb9b83f
commit 63dd87b7e5
13 changed files with 15926 additions and 13012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-operator/CmiiDeployOperator.go
View File

@@ -90,6 +90,8 @@ func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, newAppName
// assign folder prefix
deployCommonEnv.ApplyFilePrefix = folderPrefix
deployCommonEnv.TenantEnv = tenantEnv
var backendMap map[string]string
var frontendMap map[string]string
var srsMap map[string]string

2
agent-operator/CmiiDeployOperator_test.go
View File

@@ -46,7 +46,7 @@ func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
func TestCmiiNewAppDeploy(t *testing.T) {
deployNamespace := dev
deployNamespace := devOperation
// deploy to cmii environment
cmiiDeployCommonEnv := &z_dep.CommonEnvironmentConfig{

4
agent-operator/CmiiK8sOperator_test.go
View File

@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
// 计算20:00的时间
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 10, 05, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 05, 00, 0, now.Location())
duration := time.Duration(0)
@@ -277,7 +277,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
appNameTagMap := map[string]string{
//"cmii-uav-platform-dispatchh5": "5.6.0-062401",
//"cmii-uav-data-post-process": "5.6.0-062401",
"cmii-uav-industrial-portfolio": "5.6.0-071501",
"cmii-uav-industrial-portfolio": "5.6.0-071601",
//"cmii-uav-multilink": "5.5.0",
//"cmii-uav-developer": "5.6.0-062701",
//"cmii-uav-platform": "5.6.0-0626",

8
agent-operator/K8sOperator.go
View File

@@ -115,11 +115,15 @@ func ApplyByKubectl(applyFilePath string, cmiiEnv string) bool {
cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG=%s", kubeconfig))
output, err := cmd.CombinedOutput()
if err != nil {
log.ErrorF("failed to apply resources in file %s: %v \n %s", applyFilePath, err, output)
fmt.Println("failed apply file => " + applyFilePath)
fmt.Println(string(output))
fmt.Println()
return false
}
log.InfoF("successfully apply resources in file %s\n%s", applyFilePath, output)
fmt.Println("success apply file => " + applyFilePath)
fmt.Println(string(output))
fmt.Println()
return true
}

1
agent-operator/log/cmii-update-log.txt
View File

@@ -105,3 +105,4 @@
2024-07-12-09-14-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071106 5.6.0-071201
2024-07-12-11-40-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071201 5.6.0-071202
2024-07-15-10-05-51 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071206 5.6.0-071501
2024-07-16-17-06-59 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071501 5.6.0-071601