优化脚本

devops/PipeLines/Creation/003_ReleaseMajor.sh

@@ -26,6 +26,7 @@ echo ""
 
 GetMajor major
 GetReplicas replicas
+GetRegistryHost RegistryHost
 GetImageUserName registryUserName
 ToLower ${Environment} environment
 ToLower "${appName}.v${major}" releaseName

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

@@ -10,13 +10,6 @@ GetAppName appName
 
 echo "Start dynamically building the gateway route for ${appName}..."
 
-GetMajor major
-GetNameSpace namespace
-declare fdnOfK8s="${namespace}.svc.cluster.local"
-declare kongServiceBaseUrl="${KongApiServer}/services"
-declare kongRouteBaseUrl="${KongApiServer}/routes"
-declare releaseVersion="v${major}"
-
 # resilience handle
 # Maximum time in seconds that you allow the whole operation to take.
 declare maxTime=5 
@@ -68,12 +61,20 @@ function createRoute()
 	set -e
 }
 
+GetMajor major
+GetNameSpace namespace
+declare fdnOfK8s="${namespace}.svc.cluster.local"
+declare kongServiceBaseUrl="${KongApiServer}/services"
+declare kongRouteBaseUrl="${KongApiServer}/routes"
+declare releaseVersion="v${major}"
+
 for servicePrefix in `ls ./src/Services|xargs -d '/'`
 do
   GetServiceName ${servicePrefix} serviceName
   # replace . to -, compatible with k8s.
   Replace ${serviceName} '.' '-' serviceName
   ToLower "${serviceName}-${releaseVersion}" serviceNameWithVersion
+  ToLower "${serviceName}.${fdnOfK8s}" serviceFdn
   ToLower "http://${serviceFdn}/api/${prefix}" serviceUrl
 
   echo "Begin creating service[${serviceNameWithVersion}]"