diff --git a/agent-deploy/OctopusDeploy.go b/agent-deploy/OctopusDeploy.go index a1e1c80..a72c8bc 100755 --- a/agent-deploy/OctopusDeploy.go +++ b/agent-deploy/OctopusDeploy.go @@ -66,8 +66,8 @@ func OctopusDeploy() { gzipFilePrefix := "/root/octopus_image/xjyd/" frontendImageVersionMap, backendImageVersionMap, _ := image2.GzipFolderPathToCmiiImageTagMaps(gzipFilePrefix) - backendDeploy(common, backendImageVersionMap) - frontendDeploy(common, frontendImageVersionMap) + doDeployBackend(common, backendImageVersionMap) + doDeployFrontend(common, frontendImageVersionMap) d_app.SRSDeploy(common) } @@ -91,8 +91,8 @@ func CmiiAppDeploy() { gzipFilePrefix := "/root/octopus_image/xjyd/" frontendImageVersionMap, backendImageVersionMap, _ := image2.GzipFolderPathToCmiiImageTagMaps(gzipFilePrefix) - backendDeploy(common, backendImageVersionMap) - frontendDeploy(common, frontendImageVersionMap) + doDeployBackend(common, backendImageVersionMap) + doDeployFrontend(common, frontendImageVersionMap) //utils.BeautifulPrint(frontendImageVersionMap) //configMapDeploy(common) @@ -100,34 +100,16 @@ func CmiiAppDeploy() { } -var IgnoreCmiiBackendAppName = map[string]string{ - "cmii-uav-grid-datasource": "0", - "cmii-uav-grid-manage": "", - "cmii-uav-grid-engine": "", - "cmii-uav-kpi-monitor": "", - "cmii-uav-gis-server": "", - "cmii-app-release": "", - "cmii-uav-autowaypoint": "", - "cmii-uav-integration": "", - "cmii-uav-developer": "", - "cmii-open-gateway": "", - "cmii-uav-brain": "", - "cmii-uav-data-post-process": "", - "cmii-uav-multilink": "", - "cmii-uav-alarm": "", - "cmii-uav-tower": "", - "cmii-uav-clusters": "", - "cmii-uav-depotautoreturn": "", -} - -func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap map[string]string) { +func doDeployBackend(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap map[string]string) { os.Remove(z_dep.BackendApplyFilePath) for appName, tag := range backendImageVersionMap { d_app.DefaultCmiiBackendConfig.AppName = appName d_app.DefaultCmiiBackendConfig.ImageTag = tag - _, ok := IgnoreCmiiBackendAppName[appName] + + // ignore some app + _, ok := d_app.IgnoreCmiiBackendAppName[appName] if ok { d_app.DefaultCmiiBackendConfig.Replicas = "0" } else { @@ -138,7 +120,7 @@ func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap } } -func frontendDeploy(common *z_dep.CommonEnvironmentConfig, frontendImageVersionMap map[string]string) { +func doDeployFrontend(common *z_dep.CommonEnvironmentConfig, frontendImageVersionMap map[string]string) { os.Remove(z_dep.FrontendApplyFilePath) @@ -147,7 +129,14 @@ func frontendDeploy(common *z_dep.CommonEnvironmentConfig, frontendImageVersionM for appName, tag := range frontendImageVersionMap { d_app.DefaultCmiiFrontendConfig.AppName = appName d_app.DefaultCmiiFrontendConfig.ImageTag = tag - d_app.DefaultCmiiFrontendConfig.Replicas = "1" + + // ignore some app + _, ok := d_app.IgnoreCmiiFrontendAppName[appName] + if ok { + d_app.DefaultCmiiFrontendConfig.Replicas = "0" + } else { + d_app.DefaultCmiiFrontendConfig.Replicas = "1" + } value, ok := d_app.FrontendShortNameMaps[appName] if !ok { @@ -223,9 +212,9 @@ func CmiiEnvironmentDeploy(isCompleteDeploy bool, commonEnv *z_dep.CommonEnviron // frontend configMapDeploy(commonEnv) d_app.DefaultIngressConfig.IngressDeploy(commonEnv) - frontendDeploy(commonEnv, frontendImageVersionMap) + doDeployFrontend(commonEnv, frontendImageVersionMap) // backend - backendDeploy(commonEnv, backendImageVersionMap) + doDeployBackend(commonEnv, backendImageVersionMap) // srs cmiiEnvConfig.CmiiSrsConfig.SRSDeploy(commonEnv) @@ -243,10 +232,10 @@ func CmiiNewAppDeploy(commonEnv *z_dep.CommonEnvironmentConfig, backendImageVers d_app.DefaultIngressConfig.IngressDeploy(commonEnv) // frontend - frontendDeploy(commonEnv, frontendImageVersionMap) + doDeployFrontend(commonEnv, frontendImageVersionMap) // backend - backendDeploy(commonEnv, backendImageVersionMap) + doDeployBackend(commonEnv, backendImageVersionMap) } func getCmiiEnvConfigurationFromNamespace(namespace string) *e_cmii.CmiiEnvConfig { diff --git a/agent-deploy/d_app/CmiiImageConfig.go b/agent-deploy/d_app/CmiiImageConfig.go index e2b12f3..930d701 100755 --- a/agent-deploy/d_app/CmiiImageConfig.go +++ b/agent-deploy/d_app/CmiiImageConfig.go @@ -77,6 +77,38 @@ var CmiiFrontendAppMap = map[string]string{ "cmii-uav-platform-uas": "5.2.0", } +var IgnoreCmiiBackendAppName = map[string]string{ + "cmii-uav-grid-datasource": "0", + "cmii-uav-grid-manage": "", + "cmii-uav-grid-engine": "", + "cmii-uav-kpi-monitor": "", + "cmii-uav-gis-server": "", + "cmii-app-release": "", + "cmii-uav-autowaypoint": "", + "cmii-uav-integration": "", + "cmii-uav-developer": "", + "cmii-open-gateway": "", + "cmii-uav-brain": "", + "cmii-uav-data-post-process": "", + "cmii-uav-multilink": "", + "cmii-uav-alarm": "", + "cmii-uav-tower": "", + "cmii-uav-clusters": "", + "cmii-uav-depotautoreturn": "", + "cmii-uas-lifecycle": "5.2.0", + "cmii-uas-gateway": "5.2.0", +} + +var IgnoreCmiiFrontendAppName = map[string]string{ + "cmii-uav-platform-hljtt": "0", + "cmii-uav-platform-jiangsuwenlv": "0", + "cmii-uav-platform-qinghaitourism": "0", + "cmii-uav-platform-qingdao": "0", + "cmii-uav-platform-uasms": "0", + "cmii-uav-platform-uas": "0", + "cmii-uav-platform-seniclive": "0", +} + var CmiiMiddlewareNameMap = map[string]string{ "helm-nacos": "single", "helm-emqxs": "single", diff --git a/agent-deploy/d_app/DeployCmiiApp.go b/agent-deploy/d_app/DeployCmiiApp.go index df4f289..5a51d77 100755 --- a/agent-deploy/d_app/DeployCmiiApp.go +++ b/agent-deploy/d_app/DeployCmiiApp.go @@ -152,6 +152,11 @@ func (srsConfig *CmiiSrsConfig) SRSDeploy(commonEnv *z_dep.CommonEnvironmentConf // copy utils.CopySameFields(commonEnv, srsConfig) + if srsConfig.MinioInnerIP == "" { + log.Error("minio inner ip is nil !") + return false + } + if !z_dep.ParseEnvToApplyFile(srsConfig, CmiiSrsTemplate, z_dep.SRSApplyFilePath) { return false } diff --git a/agent-operator/CmiiDeployOperator.go b/agent-operator/CmiiDeployOperator.go index c7787bb..c5fa605 100755 --- a/agent-operator/CmiiDeployOperator.go +++ b/agent-operator/CmiiDeployOperator.go @@ -24,7 +24,7 @@ func CmiiEnvDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, shouldDoCompl } else { // demo ==> "" // cqlyj ==> "" - tenantEnv = deployCommonEnv.Namespace + tenantEnv = "" } // assign folder prefix @@ -85,7 +85,7 @@ func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, newAppName } else { // demo ==> "" // cqlyj ==> "" - tenantEnv = "demo" + tenantEnv = "" } // assign folder prefix diff --git a/agent-operator/CmiiK8sOperator_test.go b/agent-operator/CmiiK8sOperator_test.go index 68c0f6e..00ec7b1 100755 --- a/agent-operator/CmiiK8sOperator_test.go +++ b/agent-operator/CmiiK8sOperator_test.go @@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) { // 计算20:00的时间 now := time.Now() - targetTime := time.Date(now.Year(), now.Month(), now.Day(), 14, 35, 00, 0, now.Location()) + targetTime := time.Date(now.Year(), now.Month(), now.Day(), 14, 22, 00, 0, now.Location()) duration := time.Duration(0) @@ -277,10 +277,10 @@ 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-071701", - //"cmii-uav-multilink": "5.5.0", + "cmii-uav-industrial-portfolio": "5.6.0-071801", //"cmii-uav-developer": "5.6.0-062701", - //"cmii-uav-platform": "5.6.0-0626", + //"cmii-uav-platform": "5.6.0-071702", + //"cmii-uas-lifecycle": "5.6.0-30403-071801", } for appName, newTag := range appNameTagMap { diff --git a/agent-operator/log/cmii-update-log.txt b/agent-operator/log/cmii-update-log.txt index 6312c5d..be80cba 100755 --- a/agent-operator/log/cmii-update-log.txt +++ b/agent-operator/log/cmii-update-log.txt @@ -107,3 +107,7 @@ 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 2024-07-17-14-37-11 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071601 5.6.0-071701 +2024-07-17-17-45-00 uavcloud-demo cmii-uav-platform 5.6.0-29267-0717 5.6.0-071701 +2024-07-17-17-45-09 uavcloud-demo cmii-uas-lifecycle 5.6.0 5.6.0-30403-071701 +2024-07-17-17-48-00 uavcloud-demo cmii-uav-platform 5.6.0-071701 5.6.0-071702 +2024-07-18-10-05-00 uavcloud-demo cmii-uas-lifecycle 5.6.0-30403-071701 5.6.0-30403-071801