There is a security vulnerability in SSH key-generation using GitKraken < v8.0.1. If you used this tool to create SSH keys, please update GitKraken and regenerate. If you need help with this, contact forum-support@opengroup.org

Commit a28a76ce authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Merge branch 'azure-aks' into 'master'

Azure aks

See merge request !16
parents 47b5a5b1 812b093d
Pipeline #8048 passed with stages
in 3 minutes and 54 seconds
......@@ -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
```
......@@ -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:
......
......@@ -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 }}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment