Merge branch 'development' into 'rel/major'

Development

See merge request liermao/microservice-autodevopspipelines!47

devops/PipeLines/Creation/003_ReleaseMajor.sh

@@ -25,7 +25,9 @@ do
 done
 
 echo ""
+
 GetReplicas replicas
+GetImageUserName registryUserName
 ToLower ${Environment} environment
 
 helm install /root/AutoDevOpsPipeLinesCharts \
@@ -33,6 +35,8 @@ helm install /root/AutoDevOpsPipeLinesCharts \
 --set environment.upper=${Environment} \
 --set environment.lower=${environment} \
 --set namespace=${namespace}  \
+--set image.registryhost=${RegistryHost}
+--set image.username=${registryUserName}
 --set image.version=${version} \
 --set replicas=${replicas}
 

k8s/helm/AutoDevOpsPipeLinesCharts/templates/deployments.yml

@@ -26,7 +26,7 @@ spec:
           name: identity.appsettings.{{ .Values.environment.lower }}.json
       containers:
       - name: identity-api
-        image: {{ .Values.image.registryhost }}{{ .Values.image.username }}identity.api:{{ .Values.image.version }}
+        image: {{ .Values.image.registryhost }}/{{ .Values.image.username }}/identity.api:{{ .Values.image.version }}
         imagePullPolicy: Always
         ports:
         - containerPort: 80
@@ -69,7 +69,7 @@ spec:
           name: basket.appsettings.{{ .Values.environment.lower }}.json
       containers:
       - name: basket-api
-        image: {{ .Values.image.registryhost }}{{ .Values.image.username }}basket.api:{{ .Values.image.version }}
+        image: {{ .Values.image.registryhost }}/{{ .Values.image.username }}/basket.api:{{ .Values.image.version }}
         imagePullPolicy: Always
         ports:
         - containerPort: 80
@@ -113,7 +113,7 @@ spec:
           name: catalog.appsettings.{{ .Values.environment.lower }}.json
       containers:
       - name: catalog-api
-        image: {{ .Values.image.registryhost }}{{ .Values.image.username }}catalog.api:{{ .Values.image.version }}
+        image: {{ .Values.image.registryhost }}/{{ .Values.image.username }}/catalog.api:{{ .Values.image.version }}
         imagePullPolicy: Always
         ports:
         - containerPort: 80
@@ -157,7 +157,7 @@ spec:
           name: marketing.appsettings.{{ .Values.environment.lower }}.json
       containers:
       - name: marketing-api
-        image: {{ .Values.image.registryhost }}{{ .Values.image.username }}marketing.api:{{ .Values.image.version }}
+        image: {{ .Values.image.registryhost }}/{{ .Values.image.username }}/marketing.api:{{ .Values.image.version }}
         imagePullPolicy: Always
         ports:
         - containerPort: 80
@@ -201,7 +201,7 @@ spec:
           name: ordering.appsettings.{{ .Values.environment.lower }}.json
       containers:
       - name: ordering-api
-        image: {{ .Values.image.registryhost }}{{ .Values.image.username }}ordering.api:{{ .Values.image.version }}
+        image: {{ .Values.image.registryhost }}/{{ .Values.image.username }}/ordering.api:{{ .Values.image.version }}
         imagePullPolicy: Always
         ports:
         - containerPort: 80
@@ -245,7 +245,7 @@ spec:
           name: payment.appsettings.{{ .Values.environment.lower }}.json
       containers:
       - name: payment-api
-        image: {{ .Values.image.registryhost }}{{ .Values.image.username }}payment.api:{{ .Values.image.version }}
+        image: {{ .Values.image.registryhost }}/{{ .Values.image.username }}/payment.api:{{ .Values.image.version }}
         imagePullPolicy: Always
         ports:
         - containerPort: 80