Merge branch 'development' into 'rel/major'

Development

See merge request liermao/microservice-autodevopspipelines!52

devops/PipeLines/Creation/003_ReleaseMajor.sh

@@ -28,7 +28,7 @@ GetMajor major
 GetReplicas replicas
 GetImageUserName registryUserName
 ToLower ${Environment} environment
-ToLower "${appName}-v${major}" releaseName
+ToLower "${appName}.v${major}" releaseName
 
 helm install /root/AutoDevOpsPipeLinesCharts \
 --name=${releaseName} \

devops/PipeLines/Creation/Gateways/Kong/004_CreateGatewayRoute.sh

@@ -8,7 +8,7 @@ source ./devops/PipeLines/Functions.core.sh
 
 GetAppName appName
 
-echo "Start building the gateway for ${appName} route dynamically..."
+echo "Start dynamically building the gateway route for ${appName}..."
 
 GetMajor major
 GetNameSpace namespace
@@ -68,7 +68,6 @@ function createRoute()
 	set -e
 }
 
-declare serviceNameWithVersion=""
 declare serviceFdn=""
 declare serviceUrl=""
 declare serviceRouteUrl=""
@@ -77,12 +76,12 @@ do
   GetServiceName ${servicePrefix} serviceName
   # replace . to -, compatible with k8s.
   serviceName=${serviceName/\./\-}
-  serviceNameWithVersion="${serviceName}-${releaseVersion}"
+  ToLower "${serviceName}-${releaseVersion}" serviceNameWithVersion
   serviceFdn="${serviceName}.${fdnOfK8s}"
   serviceUrl="http://${serviceFdn}/api/${servicePrefix}"
 
   echo "Begin creating service[${serviceNameWithVersion}]"
-  createService ${kongServiceUrl} ${maxConnectTime} ${maxTime} ${retryCount} ${serviceNameWithVersion} ${serviceUrl}
+  createService ${kongServiceBaseUrl} ${maxConnectTime} ${maxTime} ${retryCount} ${serviceNameWithVersion} ${serviceUrl}
 
   echo "Begin creating route of service[${serviceNameWithVersion}]" 
   serviceRouteUrl="/api/${releaseVersion}/${servicePrefix}"

devops/PipeLines/Functions.core.sh

@@ -47,7 +47,7 @@ function GetNameSpace()
 {
     GetMajor major
 	declare ns=($(grep -oP '(?<=NameSpace>)[^<]+' "./devops/app.props"))
-	declare nsOfK8s=$(echo "${ns}-v${major}" | tr 'A-Z' 'a-z')
+	ToLower "${ns}-v${major}" nsOfK8s
 	eval $1=${nsOfK8s}
 }