updating chart values and templates

Author: salaboy

Jenkinsfile

@@ -37,12 +37,12 @@ pipeline {
       }
       stage('Build Release') {
         when {
-          branch 'master'
+          branch 'develop'
         }
         steps {
           container('maven') {
             // ensure we're not on a detached head
-            sh "git checkout master"
+            sh "git checkout develop"
             sh "git config --global credential.helper store"
 
             sh "jx step git credentials"
@@ -67,7 +67,7 @@ pipeline {
       }
       stage('Promote to Environments') {
         when {
-          branch 'master'
+          branch 'develop'
         }
         steps {
           dir ('./charts/spring-cloud-k8s-boss') {

charts/spring-cloud-k8s-boss/templates/deployment.yaml

@@ -11,7 +11,7 @@ spec:
     metadata:
       labels:
         draft: {{ default "draft-app" .Values.draft }}
-        app: {{ template "fullname" . }}
+        app: {{ .Values.service.name }}
 {{- if .Values.podAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}

charts/spring-cloud-k8s-boss/templates/service.yaml

@@ -8,6 +8,7 @@ metadata:
 {{- end }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    type: boss
 {{- if .Values.service.annotations }}
   annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}
@@ -20,4 +21,4 @@ spec:
     protocol: TCP
     name: http
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ .Values.service.name }}

charts/spring-cloud-k8s-boss/values.yaml

@@ -17,18 +17,18 @@ service:
 resources:
   limits:
     cpu: 500m
-    memory: 512Mi
+    memory: 768Mi
   requests:
     cpu: 400m
-    memory: 512Mi
+    memory: 768Mi
 probePath: /actuator/health
 livenessProbe:
   initialDelaySeconds: 60
   periodSeconds: 10
   successThreshold: 1
   timeoutSeconds: 1
 readinessProbe:
-  periodSeconds: 10
+  periodSeconds: 40
   successThreshold: 1
   timeoutSeconds: 1
 terminationGracePeriodSeconds: 10