diff --git a/molgenis-httpd/Chart.yaml b/molgenis-httpd/Chart.yaml
index c105772..4fe30f7 100644
--- a/molgenis-httpd/Chart.yaml
+++ b/molgenis-httpd/Chart.yaml
@@ -2,4 +2,7 @@ apiVersion: v1
appVersion: "1.0"
description: HTTPD for MOLGENIS
name: molgenis-httpd
-version: 0.1.0
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/molgenis-httpd/catalogIcon-molgenis-httpd.svg b/molgenis-httpd/catalogIcon-molgenis-httpd.svg
new file mode 100644
index 0000000..c1ef350
--- /dev/null
+++ b/molgenis-httpd/catalogIcon-molgenis-httpd.svg
@@ -0,0 +1,1182 @@
+
+
+
diff --git a/molgenis-jenkins/Chart.yaml b/molgenis-jenkins/Chart.yaml
index 5906916..353c25e 100755
--- a/molgenis-jenkins/Chart.yaml
+++ b/molgenis-jenkins/Chart.yaml
@@ -1,6 +1,6 @@
name: molgenis-jenkins
home: https://jenkins.io/
-version: 0.6.5
+version: 0.7.0
appVersion: 2.121
description: Molgenis installation for the jenkins chart.
sources:
diff --git a/molgenis-jenkins/templates/molgenis-jenkins-saucelabs-secret.yaml b/molgenis-jenkins/templates/molgenis-jenkins-saucelabs-secret.yaml
new file mode 100644
index 0000000..382ba17
--- /dev/null
+++ b/molgenis-jenkins/templates/molgenis-jenkins-saucelabs-secret.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Secret
+metadata:
+# this is the jenkins id.
+ name: "molgenis-jenkins-saucelabs-secret"
+ labels:
+# so we know what type it is.
+ "jenkins.io/credentials-type": "usernamePassword"
+ annotations: {
+# description - can not be a label as spaces are not allowed
+ "jenkins.io/credentials-description" : "user to authenticate against Saucelabs (saucelabs.com)"
+ }
+type: Opaque
+data:
+ username: {{ "molgenis-jenkins" | b64enc | quote }}
+ password: {{ .Values.PipelineSecrets.Env.SauceAccessKey | b64enc | quote }}
\ No newline at end of file
diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index 582c173..c60a64b 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -3,7 +3,7 @@ jenkins:
HostName: jenkins.molgenis.org
ServiceType: ClusterIP
InstallPlugins:
- - kubernetes:1.8.4
+ - kubernetes:1.12.0
- workflow-aggregator:2.5
- workflow-job:2.21
- credentials-binding:1.16
@@ -13,6 +13,7 @@ jenkins:
- blueocean:1.6.2
- github-oauth:0.29
- gogs-webhook:1.0.14
+ - sauce-ondemand:1.176
Security:
UseGitHub: false
GitHub:
@@ -25,6 +26,9 @@ jenkins:
ops:
- molgenis-ops-docker-httpd
- molgenis-ops-docker-maven
+ - molgenis-ops-docker-node
+ - molgenis-ops-tools
+ - molgenis-ops-tomcat
Jobs: |-
molgenis: |-
@@ -141,11 +145,65 @@ jenkins:
Jenkinsfile
+ molgenis-ops-docker-node: |-
+
+
+
+ NodeJS build container with Curl
+ molgenis-ops-docker-node
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ true
+ -1
+ -1
+
+
+ false
+
+
+
+
+ a756941d-6c9d-4492-bcf9-327041764be6
+ https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-node.git
+ molgenis-jenkins-gogs-secret
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Jenkinsfile
+
+
molgenis-ops-docker-maven: |-
-
+ MAVEN build container with RPMbuild and Curl
+ molgenis-ops-docker-maven
@@ -193,6 +251,112 @@ jenkins:
Jenkinsfile
+ molgenis-ops-tomcat: |-
+
+
+
+ MOLGENIS tomcat package to manage tomcat version on CentOS
+ molgenis-ops-tomcat
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ true
+ -1
+ -1
+
+
+ false
+
+
+
+
+ 4702479a-6988-4a85-b4b7-e77fa2d05ffa
+ https://git.webhosting.rug.nl/molgenis/molgenis-ops-tomcat.git
+ molgenis-jenkins-gogs-secret
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Jenkinsfile
+
+
+ molgenis-ops-tools: |-
+
+
+
+ MOLGENIS operations tools-package to configure firewall, apache, sudoers, etc.
+ molgenis-ops-tools
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ true
+ -1
+ -1
+
+
+ false
+
+
+
+
+ 4702479a-6988-4a85-b4b7-e77fa2d05ffa
+ https://git.webhosting.rug.nl/molgenis/molgenis-ops-tools.git
+ molgenis-jenkins-gogs-secret
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Jenkinsfile
+
+
# Kubernetes secret that contains a 'credentials.xml' for Jenkins
# CredentialsXmlSecret: jenkins-credentials
# Kubernetes secret that contains files to be put in the Jenkins 'secrets' directory,
@@ -359,6 +523,8 @@ PipelineSecrets:
NexusPassword: xxxx
# Password hub.docker.com
DockerHubPassword: xxxx
+ # Access key for saucelabs.com
+ SauceAccessKey: xxxx
File:
# Set to false to keep existing secret
Replace: true
@@ -398,5 +564,11 @@ PipelineSecrets:
admin
xxxx
+
+
+ gogs
+ xxxx
+ xxxx
+
\ No newline at end of file
diff --git a/molgenis-preview/Chart.yaml b/molgenis-preview/Chart.yaml
index 071bc2d..8b2e040 100644
--- a/molgenis-preview/Chart.yaml
+++ b/molgenis-preview/Chart.yaml
@@ -2,4 +2,7 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: molgenis
-version: 0.1.0
+version: 0.2.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-preview/catalogIcon-molgenis.svg
\ No newline at end of file
diff --git a/molgenis-preview/catalogIcon-molgenis.svg b/molgenis-preview/catalogIcon-molgenis.svg
new file mode 100644
index 0000000..f5e6b5d
--- /dev/null
+++ b/molgenis-preview/catalogIcon-molgenis.svg
@@ -0,0 +1,1024 @@
+
+
+
diff --git a/molgenis-preview/questions.yml b/molgenis-preview/questions.yml
new file mode 100644
index 0000000..94b6b97
--- /dev/null
+++ b/molgenis-preview/questions.yml
@@ -0,0 +1,44 @@
+
+categories:
+- MOLGENIS
+questions:
+- variable: ingress.hosts[0].name
+ default: "test.molgenis.org"
+ description: "Hostname for your stack"
+ type: hostname
+ required: true
+ group: "Services and Load Balancing"
+ label: Hostname
+- variable: molgenis.resources.limits.cpu
+ default: 1
+ description: "CPU limit for this MOLGENIS instance"
+ type: enum
+ options:
+ - "1"
+ - "2"
+ - "3"
+ - "4"
+ required: true
+ group: "MOLGENIS - Resource limits"
+ label: CPU limit
+- variable: molgenis.resources.limits.memory
+ default: 1250Mi
+ description: "Memory limit for this MOLGENIS instance"
+ type: enum
+ options:
+ - "1250Mi"
+ - "1500Mi"
+ - "2000Mi"
+ - "2500Mi"
+ required: true
+ group: "MOLGENIS - Resource limits"
+ label: Memory limit
+- variable: molgenis.javaOpts
+ default: "-Xmx1g -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+ description: "Java runtime options for the MOLGENIS instance"
+ type: enum
+ options:
+ - "-Xmx1g -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+ - "-Xmx2g -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+ group: "MOLGENIS - Resource limits"
+ label: Java memory options
diff --git a/molgenis-preview/templates/deployment.yaml b/molgenis-preview/templates/deployment.yaml
index 8eab288..8b638b8 100644
--- a/molgenis-preview/templates/deployment.yaml
+++ b/molgenis-preview/templates/deployment.yaml
@@ -1,6 +1,10 @@
apiVersion: apps/v1beta2
kind: Deployment
metadata:
+ {{- with .Values.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+ {{- end }}
name: {{ template "molgenis.fullname" . }}
labels:
app: {{ template "molgenis.name" . }}
diff --git a/molgenis-preview/templates/ingress.yaml b/molgenis-preview/templates/ingress.yaml
index 6fdfb0c..26c3c76 100644
--- a/molgenis-preview/templates/ingress.yaml
+++ b/molgenis-preview/templates/ingress.yaml
@@ -27,7 +27,7 @@ spec:
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- - host: {{ . }}
+ - host: {{ .name }}
http:
paths:
- path: {{ $ingressPath }}
diff --git a/molgenis-preview/values.yaml b/molgenis-preview/values.yaml
index 3e0ebff..a2b04d3 100644
--- a/molgenis-preview/values.yaml
+++ b/molgenis-preview/values.yaml
@@ -8,12 +8,11 @@ service:
ingress:
enabled: true
- annotations: {}
- # kubernetes.io/ingress.class: nginx
- # kubernetes.io/tls-acme: "true"
+ annotations:
+ nginx.ingress.kubernetes.io/proxy-body-size: "0"
path: /
hosts:
- - test.molgenis.org
+ - name: test.molgenis.org
tls: []
molgenis: