[agent-deploy] - cmii new app deploy

agent-deploy/OctopusDeploy.go

@@ -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
 	//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
 	backendDeploy(commonEnv, backendImageVersionMap)

agent-operator/CmiiDeployOperator.go

@@ -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 + "/"
 
 	tenantEnv := deployCommonEnv.Namespace
@@ -114,7 +114,7 @@ func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, isFrontEnd
 	deployCommonEnv.GenerateApplyFilePath()
 
 	// generate application file
-	agentdeploy.CmiiNewAppDeploy(deployCommonEnv, isFrontEnd, backendMap, frontendMap)
+	agentdeploy.CmiiNewAppDeploy(deployCommonEnv, backendMap, frontendMap)
 
 	// apply file
 	applyNewAppStuff(deployCommonEnv, false)

agent-operator/CmiiDeployOperator_test.go

@@ -43,3 +43,21 @@ func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
 	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)
+
+}