Fix helm chart for gitlab ci

elnappo · Mar 6, 2019 · 79ca349 · 79ca349
1 parent 0163079
commit 79ca349
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -740,7 +740,7 @@ rollout 100%:
         chart/
     fi
 
-    kubectl rollout status -n "$KUBE_NAMESPACE" -w "deployment/$name"
+    kubectl rollout status -n "$KUBE_NAMESPACE" -w "deployment/${name}-project-novis" || true
   }
 
   function scale() {

diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
@@ -1,10 +1,6 @@
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range $.Values.ingress.paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ . }}
-  {{- end }}
-{{- end }}
+  http://{{ .Values.ingress.host }}
 {{- else if contains "NodePort" .Values.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "project-novis.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")

diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -30,3 +30,8 @@ Create chart name and version as used by the chart label.
 {{- define "project-novis.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "project-novis.appname" -}}
+{{- $releaseName := default .Release.Name .Values.releaseOverride -}}
+{{- printf "%s" $releaseName | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -8,7 +8,8 @@ metadata:
     helm.sh/chart: {{ include "project-novis.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    track: "{{ .Values.application.track }}"
+    track: {{ .Values.application.track }}
+    app: {{ template "project-novis.appname" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -21,6 +22,7 @@ spec:
         app.kubernetes.io/name: {{ include "project-novis.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         track: "{{ .Values.application.track }}"
+        app: {{ template "project-novis.appname" . }}
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "8001"

diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
@@ -11,6 +11,8 @@ metadata:
     helm.sh/chart: {{ include "project-novis.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    track: {{ .Values.application.track }}
+    app: {{ template "project-novis.appname" . }}
 
   {{- with .Values.ingress.annotations }}
   annotations:

diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml
@@ -8,6 +8,8 @@ metadata:
     helm.sh/chart: {{ include "project-novis.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    track: {{ .Values.application.track }}
+    app: {{ template "project-novis.appname" . }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -11,6 +11,7 @@ image:
 
 nameOverride: ""
 fullnameOverride: ""
+releaseOverride: ""
 
 application:
   track: "development"