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

[agent-deploy] - cmii new app deploy

Browse Source
This commit is contained in:
zeaslity
2024-07-15 17:02:42 +08:00
parent 37d96c029d
commit 408bb9b83f
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
agent-deploy/OctopusDeploy.go
View File

@@ -228,20 +228,18 @@ func CmiiEnvironmentDeploy(isCompleteDeploy bool, commonEnv *z_dep.CommonEnviron
} }
func CmiiNewAppDeploy(commonEnv *z_dep.CommonEnvironmentConfig, isFrontendDeploy bool, backendImageVersionMap, frontendImageVersionMap map[string]string) { func CmiiNewAppDeploy(commonEnv *z_dep.CommonEnvironmentConfig, backendImageVersionMap, frontendImageVersionMap map[string]string) {
// get cmii env config from namespace // get cmii env config from namespace
//cmiiEnvConfig := getCmiiEnvConfigurationFromNamespace(commonEnv.Namespace) //cmiiEnvConfig := getCmiiEnvConfigurationFromNamespace(commonEnv.Namespace)
if isFrontendDeploy { // frontend
configMapDeploy(commonEnv)
configMapDeploy(commonEnv) d_app.DefaultIngressConfig.IngressDeploy(commonEnv)
d_app.DefaultIngressConfig.IngressDeploy(commonEnv) // frontend
frontendDeploy(commonEnv, frontendImageVersionMap)
// frontend
frontendDeploy(commonEnv, frontendImageVersionMap)
}
// backend // backend
backendDeploy(commonEnv, backendImageVersionMap) backendDeploy(commonEnv, backendImageVersionMap)

4
agent-operator/CmiiDeployOperator.go
View File

@@ -72,7 +72,7 @@ func CmiiEnvDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, shouldDoCompl
} }
func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, isFrontEnd bool, newAppNamespace string) { func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, newAppNamespace string) {
folderPrefix := "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/" + deployCommonEnv.Namespace + "/" folderPrefix := "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/" + deployCommonEnv.Namespace + "/"
tenantEnv := deployCommonEnv.Namespace tenantEnv := deployCommonEnv.Namespace
@@ -114,7 +114,7 @@ func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, isFrontEnd
deployCommonEnv.GenerateApplyFilePath() deployCommonEnv.GenerateApplyFilePath()
// generate application file // generate application file
agentdeploy.CmiiNewAppDeploy(deployCommonEnv, isFrontEnd, backendMap, frontendMap) agentdeploy.CmiiNewAppDeploy(deployCommonEnv, backendMap, frontendMap)
// apply file // apply file
applyNewAppStuff(deployCommonEnv, false) applyNewAppStuff(deployCommonEnv, false)

18
agent-operator/CmiiDeployOperator_test.go
View File

@@ -43,3 +43,21 @@ func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
CmiiEnvDeploy(commonEnv, true, demo) CmiiEnvDeploy(commonEnv, true, demo)
} }
func TestCmiiNewAppDeploy(t *testing.T) {
deployNamespace := dev
// deploy to cmii environment
cmiiDeployCommonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "lab.uavcmlc.com",
WebPort: "",
HarborIPOrCustomImagePrefix: image2.CmiiHarborPrefix,
HarborPort: "",
Namespace: deployNamespace,
TagVersion: "5.6.0",
}
CmiiNewAppDeploy(cmiiDeployCommonEnv, deployNamespace)
}