Updates pipeline with version 1.1.1

Author: Sean Sundberg

Jenkinsfile

@@ -1,3 +1,5 @@
+def pipelineVersion='1.1.1'
+println "Pipeline version: ${pipelineVersion}"
 /*
  * This is a vanilla Jenkins pipeline that relies on the Jenkins kubernetes plugin to dynamically provision agents for
  * the build containers.
@@ -220,9 +222,11 @@ spec:
 
                     git config --local credential.helper "!f() { echo username=\\$GIT_AUTH_USER; echo password=\\$GIT_AUTH_PWD; }; f"
 
-                    git fetch origin ${BRANCH}
+                    git fetch
                     git fetch --tags
-                    git checkout ${BRANCH}
+                    git tag -l
+
+                    git checkout -b ${BRANCH} --track origin/${BRANCH}
                     git branch --set-upstream-to=origin/${BRANCH} ${BRANCH}
 
                     git config --global user.name "Jenkins Pipeline"
@@ -249,10 +253,13 @@ spec:
                     release-it patch ${PRE_RELEASE} \
                       --ci \
                       --no-npm \
+                      --no-git.push \
                       --no-git.requireCleanWorkingDir \
                       --verbose \
                       -VV
 
+                    git push --follow-tags -v
+
                     echo "IMAGE_VERSION=$(git describe --abbrev=0 --tags)" > ./env-config
                     echo "IMAGE_NAME=$(basename -s .git `git config --get remote.origin.url` | tr '[:upper:]' '[:lower:]' | sed 's/_/-/g')" >> ./env-config
                     echo "REPO_URL=$(git config --get remote.origin.url)" >> ./env-config

chart/base/Chart.yaml

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

chart/base/templates/deployment.yaml

@@ -2,16 +2,25 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "starter-kit.fullname" . }}
-  {{- if and .Values.vcsInfo.repoUrl .Values.vcsInfo.branch }}
   annotations:
+  {{- if and .Values.vcsInfo.repoUrl .Values.vcsInfo.branch }}
     app.openshift.io/vcs-ref: {{ .Values.vcsInfo.branch }}
     app.openshift.io/vcs-uri: {{ .Values.vcsInfo.repoUrl }}
   {{- end }}
+  {{- if .Values.connectsTo }}
+    app.openshift.io/connects-to: {{ .Values.connectsTo }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "starter-kit.name" . }}
     helm.sh/chart: {{ include "starter-kit.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app: {{ .Release.Name }}
+    {{- if .Values.partOf }}
+    app.kubernetes.io/part-of: {{ .Values.partOf }}
+    {{- end}}
+    {{- if .Values.runtime }}
+    app.openshift.io/runtime: {{ .Values.runtime }}
+    {{- end}}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:

chart/base/templates/route.yaml

@@ -4,6 +4,8 @@ kind: Route
 apiVersion: route.openshift.io/v1
 metadata:
   name: {{ $fullName }}
+  annotations:
+    argocd.argoproj.io/sync-options: Validate=false
 spec:
   to:
     kind: Service

chart/base/values.yaml

@@ -39,3 +39,9 @@ ingress:
 vcsInfo:
   repoUrl: ""
   branch: ""
+
+partOf: ""
+
+connectsTo: ""
+
+runtime: nodejs

pipeline.yaml

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