P129679
/
molgenis-ops-docker-helm
1
0
Fork 0
Code Releases Activity

Make ports configurable in values

This commit is contained in:
Fleur Kelpin 2018-06-29 14:53:09 +02:00
parent 02e397b253
commit b959ae3f99
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
molgenis-jenkins/Chart.yaml
View File

@ -1,6 +1,6 @@
name: molgenis-jenkins name: molgenis-jenkins
home: https://jenkins.io/ home: https://jenkins.io/
version: 0.2.4 version: 0.2.5
appVersion: 2.107 appVersion: 2.107
description: Molgenis installation for the jenkins chart. description: Molgenis installation for the jenkins chart.
sources: sources:

19
molgenis-jenkins/templates/config.tpl
View File

@ -42,7 +42,7 @@ data:
{{- $key }}={{ $value }} {{- $key }}={{ $value }}
{{- $_ := set $local "first" false }} {{- $_ := set $local "first" false }}
{{- end }}</nodeSelector> {{- end }}</nodeSelector>
<nodeUsageMode>.NodeUsageMode</nodeUsageMode> <nodeUsageMode>{{ .NodeUsageMode }}</nodeUsageMode>
<volumes> <volumes>
{{- range $index, $volume := .volumes }} {{- range $index, $volume := .volumes }}
<org.csanchez.jenkins.plugins.kubernetes.volumes.{{ .type }}Volume> <org.csanchez.jenkins.plugins.kubernetes.volumes.{{ .type }}Volume>
@ -57,6 +57,15 @@ data:
<org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate> <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
<name>{{ $containerName }}</name> <name>{{ $containerName }}</name>
<image>{{ .Image }}:{{ .ImageTag | default "latest" }}</image> <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 }} {{- if .Privileged }}
<privileged>true</privileged> <privileged>true</privileged>
{{- else }} {{- else }}
@ -77,12 +86,12 @@ data:
{{- end }} {{- end }}
{{- if .resources }} {{- if .resources }}
{{- if .resources.requests }} {{- if .resources.requests }}
<resourceRequestCpu>{{ $container.resources.requests.cpu | default "" }}</resourceRequestCpu> <resourceRequestCpu>{{ .resources.requests.cpu | default "" }}</resourceRequestCpu>
<resourceRequestMemory>{{ $container.resources.requests.memory | default "" }}</resourceRequestMemory> <resourceRequestMemory>{{ .resources.requests.memory | default "" }}</resourceRequestMemory>
{{- end }} {{- end }}
{{- if .resources.limits }} {{- if .resources.limits }}
<resourceLimitCpu>{{ $container.resources.limits.cpu | default "" }}</resourceLimitCpu> <resourceLimitCpu>{{ .resources.limits.cpu | default "" }}</resourceLimitCpu>
<resourceLimitMemory>{{ $container.resources.limits.memory | default "" }}</resourceLimitMemory> <resourceLimitMemory>{{ .resources.limits.memory | default "" }}</resourceLimitMemory>
{{- end }} {{- end }}
{{- end }} {{- end }}
</org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate> </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>

14
molgenis-jenkins/values.yaml
View File

@ -95,7 +95,7 @@ jenkins:
mountPath: "/root/.m2" mountPath: "/root/.m2"
Containers: Containers:
maven: maven:
Image: "webhost12.service.rug.nl/molgenis/molgenis-maven" Image: "registry.webhosting.rug.nl/molgenis/maven"
resources: resources:
requests: requests:
cpu: "1000m" cpu: "1000m"
@ -103,6 +103,16 @@ jenkins:
memory: "1Gi" memory: "1Gi"
alpine: alpine:
Image: "spotify/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: EnvVars:
- type: Secret - type: Secret
key: PGP_PASSPHRASE key: PGP_PASSPHRASE
@ -125,7 +135,7 @@ jenkins:
secretKey: githubToken secretKey: githubToken
# If needed # If needed
# ImagePullSecret: jenkins # ImagePullSecret: jenkins
NodeSelector: {} NodeSelector: {}
PipelineSecrets: PipelineSecrets:
Env: Env:
# Set to false to keep existing secret # Set to false to keep existing secret