From b959ae3f9933e87bcd5cbd369e22fd055cf1c428 Mon Sep 17 00:00:00 2001
From: Fleur Kelpin <f.kelpin@umcg.nl>
Date: Fri, 29 Jun 2018 14:53:09 +0200
Subject: [PATCH] Make ports configurable in values

---
 molgenis-jenkins/Chart.yaml           |  2 +-
 molgenis-jenkins/templates/config.tpl | 19 ++++++++++++++-----
 molgenis-jenkins/values.yaml          | 14 ++++++++++++--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/molgenis-jenkins/Chart.yaml b/molgenis-jenkins/Chart.yaml
index 0310b56..be8727e 100755
--- a/molgenis-jenkins/Chart.yaml
+++ b/molgenis-jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: molgenis-jenkins
 home: https://jenkins.io/
-version: 0.2.4
+version: 0.2.5
 appVersion: 2.107
 description: Molgenis installation for the jenkins chart.
 sources:
diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index 5526fce..0bf4325 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -42,7 +42,7 @@ data:
                   {{- $key }}={{ $value }}
                   {{- $_ := set $local "first" false }}
                 {{- end }}</nodeSelector>
-                <nodeUsageMode>.NodeUsageMode</nodeUsageMode>
+                <nodeUsageMode>{{ .NodeUsageMode }}</nodeUsageMode>
               <volumes>
 {{- range $index, $volume := .volumes }}
                 <org.csanchez.jenkins.plugins.kubernetes.volumes.{{ .type }}Volume>
@@ -57,6 +57,15 @@ data:
                 <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
                   <name>{{ $containerName }}</name>
                   <image>{{ .Image }}:{{ .ImageTag | default "latest" }}</image>
+                  <ports>
+{{- range $index, $envVar := .Ports }}
+                    <org.csanchez.jenkins.plugins.kubernetes.PortMapping>
+                      <name>{{ .name }}</name>
+                      <containerPort>{{ .containerPort }}</containerPort>
+                      <hostPort>{{ .hostPort }}</hostPort>
+                    </org.csanchez.jenkins.plugins.kubernetes.PortMapping>
+{{- end }}
+                  </ports>
 {{- if .Privileged }}
                   <privileged>true</privileged>
 {{- else }}
@@ -77,12 +86,12 @@ data:
 {{- end }}
 {{- if .resources }}
 {{- if .resources.requests }}
-                  <resourceRequestCpu>{{ $container.resources.requests.cpu | default "" }}</resourceRequestCpu>
-                  <resourceRequestMemory>{{ $container.resources.requests.memory | default "" }}</resourceRequestMemory>
+                  <resourceRequestCpu>{{ .resources.requests.cpu | default "" }}</resourceRequestCpu>
+                  <resourceRequestMemory>{{ .resources.requests.memory | default "" }}</resourceRequestMemory>
 {{- end }}
 {{- if .resources.limits }}
-                  <resourceLimitCpu>{{ $container.resources.limits.cpu | default "" }}</resourceLimitCpu>
-                  <resourceLimitMemory>{{ $container.resources.limits.memory | default "" }}</resourceLimitMemory>
+                  <resourceLimitCpu>{{ .resources.limits.cpu | default "" }}</resourceLimitCpu>
+                  <resourceLimitMemory>{{ .resources.limits.memory | default "" }}</resourceLimitMemory>
 {{- end }}
 {{- end }}
                 </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index b3a9c5d..cff214b 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -95,7 +95,7 @@ jenkins:
           mountPath: "/root/.m2"
       Containers:
         maven:
-          Image: "webhost12.service.rug.nl/molgenis/molgenis-maven"
+          Image: "registry.webhosting.rug.nl/molgenis/maven"
           resources:
             requests:
               cpu: "1000m"
@@ -103,6 +103,16 @@ jenkins:
               memory: "1Gi"
         alpine:
           Image: "spotify/alpine"
+        elasticsearch:
+          Image: "elasticsearch"
+          ImageTag: "5.5.1"
+          Ports:
+            - name: rest
+              containerPort: "9200"
+              hostPort: "9200"
+            - name: api
+              containerPort: "9300"
+              hostPort: "9300"
       EnvVars:
         - type: Secret
           key: PGP_PASSPHRASE
@@ -125,7 +135,7 @@ jenkins:
           secretKey: githubToken
       # If needed
       # ImagePullSecret: jenkins
-    NodeSelector: {}
+      NodeSelector: {}
 PipelineSecrets:
   Env:
     # Set to false to keep existing secret