Merge branch 'azure-aks' into 'master'

Azure aks

See merge request !16

devops/azure/README.md

@@ -9,13 +9,9 @@ BRANCH=${PARTIAL/./-}
 
 echo "--set image.branch=$BRANCH --set image.tag=$TAG"
 
-# Remove the Service
-kubectl delete deployment osdu-gitlab-$AZURE_SERVICE
-kubectl delete service osdu-gitlab-$AZURE_SERVICE
-
 # Install the Service
-helm upgrade -i osdu-gitlab chart --set image.branch=$BRANCH --set image.tag=$TAG
-pod=$(kubectl get pod |grep $AZURE_SERVICE |awk '{print $1}')
+helm upgrade -i osdu-gitlab-$AZURE_SERVICE chart --set image.branch=$BRANCH --set image.tag=$TAG
+pod=$(kubectl get pod |grep $AZURE_SERVICE | tail -1 | awk '{print $1}')
 status=$(kubectl wait --for=condition=Ready pod/$pod --timeout=60s)
 if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
 ```

devops/azure/chart/templates/deployment.yaml

@@ -15,17 +15,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}-{{ .Chart.Name }}
+  name: {{ .Release.Name }}
   namespace: osdu
 spec:
   replicas: {{ .Values.global.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-{{ .Chart.Name }}
+      app: {{ .Chart.Name }}
   template:
     metadata:
       labels:
-        app: {{ .Release.Name }}-{{ .Chart.Name }}
+        app: {{ .Chart.Name }}
         aadpodidbinding: osdu-identity
     spec:
       volumes:
@@ -36,7 +36,7 @@ spec:
           volumeAttributes:
             secretProviderClass: azure-keyvault
       containers:
-      - name: {{ .Release.Name }}-{{ .Chart.Name }}
+      - name: {{ .Chart.Name }}
         image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: Always
         ports:

devops/azure/chart/templates/service.yaml

@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-{{ .Chart.Name }}
+  name: {{ .Chart.Name }}
   namespace: osdu
 spec:
   type: ClusterIP
@@ -24,4 +24,4 @@ spec:
     port: 80
     targetPort: 80
   selector:
-    app: {{ .Release.Name }}-{{ .Chart.Name }}
+    app: {{ .Chart.Name }}