diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index dd504b8..570ce05 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -77,7 +77,7 @@ data:
false
{{- end }}
/home/jenkins
- {{ .Command | default "cat" }}
+ {{ .Command | default "" }}
{{ .Args | default "" }}
{{- if .TTY }}
true
@@ -129,7 +129,7 @@ data:
{{ .Release.Namespace }}
http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}
{{ template "jenkins.fullname" . }}-agent:50000
- 10
+ 50
5
0
0
diff --git a/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml b/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml
new file mode 100644
index 0000000..a16303d
--- /dev/null
+++ b/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Secret
+metadata:
+# this is the jenkins id.
+ name: "molgenis-jenkins-gogs-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 GOGS (git.webhosting.rug.nl)"
+ }
+type: Opaque
+data:
+ username: {{ "p281392" | b64enc | quote }}
+ password: {{ .Values.PipelineSecrets.Env.GogsToken | b64enc | quote }}
\ No newline at end of file
diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index ec5eb37..9b10fef 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -74,6 +74,111 @@ jenkins:
+ molgenis-operations: |-
+
+
+
+ HTTPD server that can be used for redirection and proxieing
+ molgenis-ops-docker-httpd
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ true
+ -1
+ -1
+
+
+ false
+
+
+
+
+ a756941d-6c9d-4492-bcf9-327041764be6
+ https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-httpd.git
+ molgenis-jenkins-github-secret
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Jenkinsfile
+
+
+ molgenis-ops-docker-maven: |-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ true
+ -1
+ -1
+
+
+ false
+
+
+
+
+ 4702479a-6988-4a85-b4b7-e77fa2d05ffa
+ https://git.webhosting.rug.nl/molgenis/molgenis=ops-docker-maven.git
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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,
@@ -97,34 +202,26 @@ jenkins:
Containers:
maven:
Image: "registry.webhosting.rug.nl/molgenis/maven"
+ Command: cat
TTY: true
- resources:
- requests:
- cpu: "1000m"
- limits:
- memory: "1Gi"
alpine:
Image: "spotify/alpine"
+ Command: cat
TTY: true
elasticsearch:
Image: "elasticsearch"
ImageTag: "5.5.1"
- TTY: true
Ports:
- name: rest
containerPort: "9200"
- hostPort: "9200"
- 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
@@ -135,10 +232,7 @@ jenkins:
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"
+ value: "http://nexus.molgenis-nexus:8081/repository/npm-central/"
- type: Secret
key: SONAR_TOKEN
secretName: molgenis-pipeline-env-secret
@@ -164,6 +258,8 @@ PipelineSecrets:
CodecovToken: xxxx
# Token for github bot account
GitHubToken: xxxx
+ # Token for github bot account
+ GogsToken: xxxx
# Token for sonarcloud.io
SonarToken: xxxx
# Password Local NEXUS