Merge branch 'chore/pipeline' of P129679/molgenis-ops-docker-helm into master

.gitignore

@@ -1,2 +1,3 @@
 .idea
 *.iml
+target

Jenkinsfile

@@ -0,0 +1,40 @@
+pipeline {
+    agent {
+        kubernetes {
+            label 'helm'
+        }
+    }
+    stages {
+        stage('Test') {
+            steps {
+                container('chart-testing') {
+                    sh "chart_test.sh --no-install --all"
+                }
+            }
+        }
+        stage('Package') {
+            steps {
+                container('chart-testing'){
+                    sh 'mkdir target'
+                    sh 'for dir in charts/*; do helm package --destination target "$dir"; done'
+                }
+            }
+        }
+        stage('Deploy') {
+            when {
+                branch 'master'
+            }
+            steps {
+                container('vault') {
+                    script {
+                        env.NEXUS_USER = sh(script: 'vault read -field=username secret/ops/account/nexus', returnStdout: true)
+                        env.NEXUS_PWD = sh(script: 'vault read -field=password secret/ops/account/nexus', returnStdout: true)
+                    }
+                }
+                container('alpine') {
+                    sh 'set +x; for chart in target/*; do curl -L -u $NEXUS_USER:$NEXUS_PWD http://registry.molgenis.org/repository/helm/ --upload-file "$chart"; done'
+                }
+            }
+        }
+    }
+}

charts/molgenis-httpd/Chart.yaml

@@ -6,3 +6,7 @@ version: 0.1.0
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-httpd/catalogIcon-molgenis-httpd.svg
+home: http://httpd.apache.org
+maintainers:
+- name: sidohaakma
+- name: fdlk

charts/molgenis-jenkins/Chart.yaml

@@ -1,8 +1,11 @@
 name: molgenis-jenkins
 home: https://jenkins.io/
-version: 0.8.0
-appVersion: 2.121
+version: 0.8.1
+appVersion: 2.138.1
 description: Molgenis installation for the jenkins chart.
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg
+maintainers:
+- name: fdlk
+- name: sidohaakma

charts/molgenis-jenkins/values.yaml

@@ -583,8 +583,42 @@ jenkins:
               cpu: "1"
               memory: "512Mi"
       NodeSelector: {}
+    helm:
+      Label: helm
+      NodeUsageMode: EXCLUSIVE
+      Containers:
+        chart-testing:
+          Image: "quay.io/helmpack/chart-testing"
+          ImageTag: v1.1.0
+          Command: cat
+          WorkingDir: /home/jenkins
+          TTY: true
+        alpine:
+          Image: "spotify/alpine"
+          Command: cat
+          WorkingDir: /home/jenkins
+          TTY: true
+        vault:
+          Image: "vault"
+          Command: cat
+          WorkingDir: /home/jenkins
+          TTY: true
+          EnvVars:
+            - type: Secret
+              key: VAULT_TOKEN
+              secretName: molgenis-pipeline-vault-secret
+              secretKey: token
+            - type: Secret
+              key: VAULT_SKIP_VERIFY
+              secretName: molgenis-pipeline-vault-secret
+              secretKey: skipVerify
+            - type: Secret
+              key: VAULT_ADDR
+              secretName: molgenis-pipeline-vault-secret
+              secretKey: addr
+      NodeSelector: {}
 
-#secret contains configuration for the kubernetes secrets that jenkins can access
+# secret contains configuration for the kubernetes secrets that jenkins can access
 secret:
   # vault configures the vault secret
   vault:

charts/molgenis-nexus/Chart.yaml

@@ -6,3 +6,7 @@ version: 0.4.2
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-nexus/catalogIcon-molgenis-nexus.svg
+home: https://www.sonatype.com/nexus-repository-oss
+maintainers:
+- name: sidohaakma
+- name: fdlk

charts/molgenis-opencpu/Chart.yaml

@@ -6,3 +6,7 @@ version: 0.1.1
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-opencpu/catalogIcon-molgenis-opencpu.svg
+home: https://www.opencpu.org
+maintainers:
+- name: sidohaakma
+- name: fdlk

charts/molgenis-vault/Chart.yaml

@@ -4,3 +4,7 @@ description: MOLGENIS vault
 name: molgenis-vault
 version: 0.1.1
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-vault/catalogIcon-molgenis-vault.svg
+home: https://github.com/coreos/vault-operator
+maintainers:
+- name: fdlk
+- name: sidohaakma

charts/molgenis-vault/values.yaml

@@ -70,7 +70,7 @@ ui:
     # limits:
     #  cpu: 100m
     #  memory: 128Mi
-    #requests:
+    # requests:
     #  cpu: 100m
     #  memory: 128Mi
   nodeSelector: {}

charts/molgenis/Chart.yaml

@@ -6,3 +6,7 @@ version: 0.4.3
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis/catalogIcon-molgenis.svg
+home: http://molgenis.org
+maintainers:
+- name: sidohaakma
+- name: fdlk

charts/molgenis/values.yaml

@@ -64,12 +64,12 @@ elasticsearch:
   javaOpts: "-Xms1g -Xmx1g"
   clusterName: molgenis
   resources:
-   limits:
-    cpu: 2
-    memory: 3Gi
-   requests:
-    cpu: 100m
-    memory: 1Gi
+    limits:
+      cpu: 2
+      memory: 3Gi
+    requests:
+      cpu: 100m
+      memory: 1Gi
   persistence:
     claim: elasticsearch-nfs-claim
     size: 5Gi