[agent-go] - fix bugs

agent-deploy/OctopusDeploy.go

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

agent-deploy/uavcloud-dev/k8s-frontend.yaml

@@ -88,7 +88,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -177,7 +177,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -266,7 +266,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -355,7 +355,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -444,7 +444,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -533,7 +533,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -622,7 +622,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -711,7 +711,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -800,7 +800,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -889,7 +889,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -978,7 +978,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1067,7 +1067,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1156,7 +1156,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1245,7 +1245,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1334,7 +1334,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1423,7 +1423,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1512,7 +1512,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1601,7 +1601,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1690,7 +1690,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1779,7 +1779,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1868,7 +1868,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -1957,7 +1957,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -2046,7 +2046,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -2135,7 +2135,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -2224,7 +2224,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js
@@ -2313,7 +2313,7 @@ spec:
               memory: 500Mi
           volumeMounts:
             - name: nginx-conf
-              mountPath: /usr/local/nginx/conf/nginx.conf
+              mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
             - name: tenant-prefix
               subPath: ingress-config.js