From 9208f4daaa248bf19d850aaa29f45a3240e14413 Mon Sep 17 00:00:00 2001
From: Fleur Kelpin <f.kelpin@umcg.nl>
Date: Fri, 29 Jun 2018 15:09:15 +0200
Subject: [PATCH 1/4] enable TTY

---
 molgenis-jenkins/values.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index cff214b..3dd7c2d 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -96,6 +96,7 @@ jenkins:
       Containers:
         maven:
           Image: "registry.webhosting.rug.nl/molgenis/maven"
+          TTY: true
           resources:
             requests:
               cpu: "1000m"
@@ -103,9 +104,11 @@ jenkins:
               memory: "1Gi"
         alpine:
           Image: "spotify/alpine"
+          TTY: true
         elasticsearch:
           Image: "elasticsearch"
           ImageTag: "5.5.1"
+          TTY: true
           Ports:
             - name: rest
               containerPort: "9200"

From 687a1817f9ced025ed3f63724124831b2449ea21 Mon Sep 17 00:00:00 2001
From: Fleur Kelpin <f.kelpin@umcg.nl>
Date: Fri, 29 Jun 2018 15:21:00 +0200
Subject: [PATCH 2/4] rename pod and don't namespace the label

---
 molgenis-jenkins/templates/config.tpl | 2 +-
 molgenis-jenkins/values.yaml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index 0bf4325..dd504b8 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -34,7 +34,7 @@ data:
               <name>{{ $podName }}</name>
               <instanceCap>2147483647</instanceCap>
               <idleMinutes>0</idleMinutes>
-              <label>{{ $.Release.Name }}-{{ .Label }}</label>
+              <label>{{ .Label }}</label>
               <nodeSelector>
                 {{- $local := dict "first" true }}
                 {{- range $key, $value := .NodeSelector }}
diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index 3dd7c2d..2d8ec37 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -83,8 +83,8 @@ jenkins:
   rbac:
     install: true
   Pods:
-    default:
-      Label: "default"
+    molgenis:
+      Label: molgenis
       NodeUsageMode: NORMAL
       volumes:
         - type: HostPath

From f32c2e0d52cd12670d47ff7e1cf94a75a9f7a592 Mon Sep 17 00:00:00 2001
From: Fleur Kelpin <f.kelpin@umcg.nl>
Date: Fri, 29 Jun 2018 15:24:51 +0200
Subject: [PATCH 3/4] Add postgres image

---
 molgenis-jenkins/values.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index 2d8ec37..ccef39f 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -116,6 +116,14 @@ jenkins:
             - name: api
               containerPort: "9300"
               hostPort: "9300"
+        postgres:
+          Image: "postgres"
+          ImageTag: "9.6-alpine"
+          TTY: true
+          Ports:
+            - name: postgres
+              containerPort: "5432"
+              hostPort: "5432"
       EnvVars:
         - type: Secret
           key: PGP_PASSPHRASE

From e91ea8d22f9511e75578792fdb0820af5ac777bd Mon Sep 17 00:00:00 2001
From: Fleur Kelpin <f.kelpin@umcg.nl>
Date: Fri, 29 Jun 2018 19:26:30 +0200
Subject: [PATCH 4/4] Update values.yaml

---
 molgenis-jenkins/values.yaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index ccef39f..7d054ad 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -10,6 +10,7 @@ jenkins:
       - git:3.9.1
       - github-branch-source:2.3.6
       - kubernetes-credentials-provider:0.9
+      - blueocean:1.6.1
     Jobs: |-
       molgenis: |-
         <?xml version='1.1' encoding='UTF-8'?>
@@ -132,6 +133,12 @@ jenkins:
         - type: KeyValue
           key: PGP_SECRETKEY
           value: "keyfile:/root/.m2/key.asc"
+        - type: KeyValue
+          key: npm_config_registry
+          value: "http://nexus.molgenis-nexus:8081/repository/npm-central"
+        - type: KeyValue
+          key: yarn_proxy
+          value: "http://nexus.molgenis-nexus:8081/repository/npm-central"
         - type: Secret
           key: SONAR_TOKEN
           secretName: molgenis-pipeline-env-secret
@@ -176,7 +183,7 @@ PipelineSecrets:
           <mirror>
             <id>nexus</id>
             <mirrorOf>external:*</mirrorOf>
-            <url>https://registry.molgenis.org/repository/maven-central/</url>
+            <url>http://nexus.molgenis-nexus:8081/repository/maven-central/</url>
           </mirror>
         </mirrors>
         <servers>
@@ -188,7 +195,7 @@ PipelineSecrets:
           </server>
           <server>
             <id>local-nexus</id>
-            <url>https://registry.molgenis.org/repository/maven-snapshots/</url>
+            <url>http://nexus.molgenis-nexus:8081/repository/maven-snapshots/</url>
             <username>admin</username>
             <password>xxxxx</password>
           </server>