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 }}
- .NodeUsageMode
+ {{ .NodeUsageMode }}
{{- range $index, $volume := .volumes }}
@@ -57,6 +57,15 @@ data:
{{ $containerName }}
{{ .Image }}:{{ .ImageTag | default "latest" }}
+
+{{- range $index, $envVar := .Ports }}
+
+ {{ .name }}
+ {{ .containerPort }}
+ {{ .hostPort }}
+
+{{- end }}
+
{{- if .Privileged }}
true
{{- else }}
@@ -77,12 +86,12 @@ data:
{{- end }}
{{- if .resources }}
{{- if .resources.requests }}
- {{ $container.resources.requests.cpu | default "" }}
- {{ $container.resources.requests.memory | default "" }}
+ {{ .resources.requests.cpu | default "" }}
+ {{ .resources.requests.memory | default "" }}
{{- end }}
{{- if .resources.limits }}
- {{ $container.resources.limits.cpu | default "" }}
- {{ $container.resources.limits.memory | default "" }}
+ {{ .resources.limits.cpu | default "" }}
+ {{ .resources.limits.memory | default "" }}
{{- end }}
{{- end }}
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