Updates pipeline with v1.1.3

Author: Sean Sundberg

Jenkinsfile

@@ -1,4 +1,4 @@
-def pipelineVersion='1.1.1'
+def pipelineVersion='1.1.3'
 println "Pipeline version: ${pipelineVersion}"
 /*
  * This is a vanilla Jenkins pipeline that relies on the Jenkins kubernetes plugin to dynamically provision agents for
@@ -226,8 +226,10 @@ spec:
                     git fetch --tags
                     git tag -l
 
+                    COMMIT_HASH=$(git rev-parse HEAD)
                     git checkout -b ${BRANCH} --track origin/${BRANCH}
                     git branch --set-upstream-to=origin/${BRANCH} ${BRANCH}
+                    git reset --hard ${COMMIT_HASH}
 
                     git config --global user.name "Jenkins Pipeline"
                     git config --global user.email "[email protected]"
@@ -372,10 +374,12 @@ spec:
 
                     # sleep for 10 seconds to allow enough time for the server to start
                     sleep 10
-                    while [ $(curl -sL -w "%{http_code}\\n" "${URL}/health" -o /dev/null --connect-timeout 3 --max-time 5 --retry 3 --retry-max-time 30) != "200" ]; do
+                    echo "Health check start"
+                    while [[ $(curl -sL -w "%{http_code}\\n" "${URL}/health" -o /dev/null --connect-timeout 3 --max-time 5 --retry 3 --retry-max-time 30) != "200" ]]; do
                         sleep 30
+                        echo "Health check failure. Remaining retries: $sleep_countdown"
                         sleep_countdown=$((sleep_countdown-1))
-                        if [ sleep_countdown=0 ]; then
+                        if [[ $sleep_countdown -eq 0 ]]; then
                                 echo "Could not reach health endpoint: ${URL}/health"
                                 exit 1;
                         fi

chart/base/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: base
-version: 1.1.1
+version: 1.1.3
 branch: dev

chart/base/templates/_helpers.tpl

@@ -6,11 +6,6 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "starter-kit.appname" -}}
-{{ $namespace := $.Release.Namespace }}
-{{- printf "%s-%s" $namespace (include "starter-kit.name" .) -}}
-{{- end -}}
-
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

chart/base/values.yaml

@@ -44,4 +44,4 @@ partOf: inventory
 
 connectsTo: inventory-management-bff-solution
 
-runtime: nodejs
+runtime: js

pipeline.yaml

@@ -1,4 +1,4 @@
-version: 1.1.1
+version: 1.1.3
 name: nodejs
 runtime: nodejs
 build-tool: node