Commit 812b093d authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Updated chart to be more uniform

parent d69c0f3a
Pipeline #6870 passed with stages
in 7 minutes and 54 seconds
...@@ -9,13 +9,9 @@ BRANCH=${PARTIAL/./-} ...@@ -9,13 +9,9 @@ BRANCH=${PARTIAL/./-}
echo "--set image.branch=$BRANCH --set image.tag=$TAG" 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 # Install the Service
helm upgrade -i osdu-gitlab chart --set image.branch=$BRANCH --set image.tag=$TAG helm upgrade -i osdu-gitlab-$AZURE_SERVICE chart --set image.branch=$BRANCH --set image.tag=$TAG
pod=$(kubectl get pod |grep $AZURE_SERVICE |awk '{print $1}') pod=$(kubectl get pod |grep $AZURE_SERVICE | tail -1 | awk '{print $1}')
status=$(kubectl wait --for=condition=Ready pod/$pod --timeout=60s) status=$(kubectl wait --for=condition=Ready pod/$pod --timeout=60s)
if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
``` ```
...@@ -15,17 +15,17 @@ ...@@ -15,17 +15,17 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ .Release.Name }}-{{ .Chart.Name }} name: {{ .Release.Name }}
namespace: osdu namespace: osdu
spec: spec:
replicas: {{ .Values.global.replicaCount }} replicas: {{ .Values.global.replicaCount }}
selector: selector:
matchLabels: matchLabels:
app: {{ .Release.Name }}-{{ .Chart.Name }} app: {{ .Chart.Name }}
template: template:
metadata: metadata:
labels: labels:
app: {{ .Release.Name }}-{{ .Chart.Name }} app: {{ .Chart.Name }}
aadpodidbinding: osdu-identity aadpodidbinding: osdu-identity
spec: spec:
volumes: volumes:
...@@ -36,7 +36,7 @@ spec: ...@@ -36,7 +36,7 @@ spec:
volumeAttributes: volumeAttributes:
secretProviderClass: azure-keyvault secretProviderClass: azure-keyvault
containers: containers:
- name: {{ .Release.Name }}-{{ .Chart.Name }} - name: {{ .Chart.Name }}
image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }} image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }}
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ .Release.Name }}-{{ .Chart.Name }} name: {{ .Chart.Name }}
namespace: osdu namespace: osdu
spec: spec:
type: ClusterIP type: ClusterIP
...@@ -24,4 +24,4 @@ spec: ...@@ -24,4 +24,4 @@ spec:
port: 80 port: 80
targetPort: 80 targetPort: 80
selector: selector:
app: {{ .Release.Name }}-{{ .Chart.Name }} app: {{ .Chart.Name }}
Supports Markdown
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