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.
@@ -219,11 +221,11 @@ spec:
                     fi
 
                     git config --local credential.helper "!f() { echo username=\\$GIT_AUTH_USER; echo password=\\$GIT_AUTH_PWD; }; f"
-                    
+
                     git fetch
                     git fetch --tags
                     git tag -l
-                    
+
                     git checkout -b ${BRANCH} --track origin/${BRANCH}
                     git branch --set-upstream-to=origin/${BRANCH} ${BRANCH}
 

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/_helpers.tpl

@@ -2,7 +2,6 @@
 {{/*
 Expand the name of the chart.
 */}}
-
 {{- define "starter-kit.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

chart/base/templates/deployment.yaml

@@ -7,16 +7,20 @@ metadata:
     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.openshift.io/runtime: nodejs
     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:
@@ -55,10 +59,10 @@ spec:
               value: ""
             - name: PROTOCOLS
               value: ""
-            - name: API_HOST
-              value: {{ printf "%s:80" .Values.connectsTo | quote }}
             - name: LOG_LEVEL
               value: {{ .Values.logLevel | quote }}
+            - name: API_HOST
+              value: {{ printf "%s:80" .Values.connectsTo | quote }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

chart/base/templates/ingress.yaml

@@ -1,20 +1,19 @@
 {{- if .Values.ingress.enabled -}}
-{{- $serviceName := include "starter-kit.fullname" . -}}
 {{- $fullName := include "starter-kit.fullname" . -}}
-{{- $namespace := default .Release.Namespace .Values.ingress.appid.binding.namespace -}}
+{{- $namespace := .Release.Namespace -}}
 {{- $requestType := .Values.ingress.appid.requestType -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app.kubernetes.io/name: {{ include "starter-kit.appname" . }}
+    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.ingress.appid.enabled }}
   annotations:
-    ingress.bluemix.net/appid-auth: {{ printf "bindSecret=%s namespace=%s requestType=%s serviceName=%s" (required "AppId binding is required to enable auth on the ingress" .Values.ingress.appid.binding.name) $namespace $requestType $fullName }}
+    ingress.bluemix.net/appid-auth: {{ printf "bindSecret=%s namespace=%s requestType=%s serviceName=%s" (required "AppId binding is required to enable auth on the ingress" .Values.appidBinding) $namespace $requestType $fullName }}
   {{- end}}
 spec:
 {{- if include "starter-kit.tlsSecretName" . }}
@@ -29,6 +28,6 @@ spec:
         paths:
           - path: {{ .path }}
             backend:
-              serviceName: {{ $serviceName }}
+              serviceName: {{ $fullName }}
               servicePort: http
 {{- end }}

chart/base/templates/route.yaml

@@ -1,17 +1,17 @@
 {{- if .Values.route.enabled -}}
-{{- $serviceName := include "starter-kit.name" . -}}
+{{- $fullName := include "starter-kit.fullname" . -}}
 kind: Route
 apiVersion: route.openshift.io/v1
 metadata:
-  name: {{ include "starter-kit.fullname" . }}
+  name: {{ $fullName }}
   annotations:
     argocd.argoproj.io/sync-options: Validate=false
 spec:
   to:
     kind: Service
-    name: {{ $serviceName }}
+    name: {{ $fullName }}
     weight: 100
   tls:
     termination: edge
   wildcardPolicy: None
-{{- end }}
+{{- end }}

chart/base/templates/service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "starter-kit.name" . }}
+  name: {{ include "starter-kit.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "starter-kit.appname" . }}
+    app.kubernetes.io/name: {{ include "starter-kit.name" . }}
     helm.sh/chart: {{ include "starter-kit.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app: {{ .Release.Name }}

chart/base/values.yaml

@@ -6,8 +6,6 @@ global: {}
 replicaCount: 1
 logLevel: "debug"
 
-connectsTo: inventory-management-bff-solution
-
 image:
   repository: replace
   tag: replace
@@ -30,9 +28,6 @@ ingress:
     enabled: false
     # web or app - https://cloud.ibm.com/docs/services/appid?topic=appid-kube-auth
     requestType: web
-    binding:
-      name: ""
-      namespace: ""
 
 #  host: hello
   namespaceInHost: true
@@ -45,4 +40,8 @@ vcsInfo:
   repoUrl: ""
   branch: ""
 
-partOf: "inventory"
+partOf: inventory
+
+connectsTo: inventory-management-bff-solution
+
+runtime: nodejs

pipeline.yaml

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