Fix indentation of JAVA_OPTS (#76)

Closes #25

Signed-off-by: Torsten Walter <mail@torstenwalter.de>

Author: torstenwalter

charts/jenkins/CHANGELOG.md

@@ -10,6 +10,14 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 
 The change log until v1.5.7 was auto-generated based on git commits. Those entries include a reference to the git commit to be able to get more details.
 
+## 2.8.1
+
+Fix indentation of JAVA_OPTS
+
+## 2.8.0
+
+Add support for helm unittest and include first tests
+
 ## 2.7.2
 
 Target port of container `jenkins-sc-config` taken the value from values.yaml.

charts/jenkins/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.8.0
+version: 2.8.1
 appVersion: lts
 description: Open source continuous integration server. It supports multiple SCM tools
   including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based

charts/jenkins/templates/jenkins-master-deployment.yaml

@@ -184,9 +184,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
             - name: JAVA_OPTS
-              value: >
-                {{ default "" .Values.master.javaOpts }}
-                {{ if .Values.master.sidecars.configAutoReload.enabled }} -Dcasc.reload.token=$(POD_NAME) {{ end }}
+              value: {{- if .Values.master.sidecars.configAutoReload.enabled }} -Dcasc.reload.token=$(POD_NAME) {{- end }} {{ default "" .Values.master.javaOpts }}
             - name: JENKINS_OPTS
               value: "{{ if .Values.master.jenkinsUriPrefix }}--prefix={{ .Values.master.jenkinsUriPrefix }} {{ end }}{{ default "" .Values.master.jenkinsOpts}}"
             - name: JENKINS_SLAVE_AGENT_PORT

charts/jenkins/tests/deployment_test.yaml

@@ -43,6 +43,14 @@ tests:
       - equal:
           path: spec.template.spec.serviceAccountName
           value: my-release-jenkins
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: jenkins
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: JAVA_OPTS
+            value: "-Dcasc.reload.token=$(POD_NAME)"
   - it: test different values
     set:
       master:
@@ -84,10 +92,17 @@ tests:
           value: jenkins/jenkins:2.249.1-slim
   - it: custom image
     set:
-      master.image: registry/image
-      master.tag: my-tag
+      master:
+        image: registry/image
+        tag: my-tag
+        javaOpts: -Dio.jenkins.plugins.kubernetes.disableNoDelayProvisioning=true
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
           value: registry/image:my-tag
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: JAVA_OPTS
+            value: "-Dcasc.reload.token=$(POD_NAME) -Dio.jenkins.plugins.kubernetes.disableNoDelayProvisioning=true"