Compare commits
21 Commits
2e4e397aff
...
d4a8a3ed42
Author | SHA1 | Date |
---|---|---|
Sido Haakma | d4a8a3ed42 | |
Fleur Kelpin | d4f2dadb06 | |
Fleur Kelpin | f440437862 | |
Fleur Kelpin | 71a0889ad8 | |
Fleur Kelpin | f43b21bcc6 | |
Fleur Kelpin | 367c63eaa5 | |
Fleur Kelpin | 55ad5b26fb | |
Fleur Kelpin | 86d6dfb86b | |
Fleur Kelpin | b58a1d2042 | |
Fleur Kelpin | 28bf98e6b2 | |
Fleur Kelpin | 26d366f1a1 | |
Fleur Kelpin | b64ee00cff | |
Fleur Kelpin | 2190ada376 | |
Fleur Kelpin | f6905334e1 | |
Sido Haakma | f94e6da6e3 | |
Fleur Kelpin | b73fd578ea | |
Fleur Kelpin | 486ab89b41 | |
Fleur Kelpin | d8b8bd9a22 | |
sido | 4e6349dacb | |
sido | 4312e92860 | |
sido | 02f7b7de1b |
|
@ -1,2 +1,3 @@
|
||||||
.idea
|
.idea
|
||||||
*.iml
|
*.iml
|
||||||
|
target
|
|
@ -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'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -5,4 +5,8 @@ name: molgenis-httpd
|
||||||
version: 0.1.0
|
version: 0.1.0
|
||||||
sources:
|
sources:
|
||||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
- 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
|
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
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 89 KiB |
|
@ -48,4 +48,4 @@ nodeSelector: {}
|
||||||
|
|
||||||
tolerations: []
|
tolerations: []
|
||||||
|
|
||||||
affinity: {}
|
affinity: {}
|
|
@ -1,8 +1,11 @@
|
||||||
name: molgenis-jenkins
|
name: molgenis-jenkins
|
||||||
home: https://jenkins.io/
|
home: https://jenkins.io/
|
||||||
version: 0.7.1
|
version: 0.8.1
|
||||||
appVersion: 2.121
|
appVersion: 2.138.1
|
||||||
description: Molgenis installation for the jenkins chart.
|
description: Molgenis installation for the jenkins chart.
|
||||||
sources:
|
sources:
|
||||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
- 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
|
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg
|
||||||
|
maintainers:
|
||||||
|
- name: fdlk
|
||||||
|
- name: sidohaakma
|
|
@ -75,6 +75,10 @@ Token used by Jenkins to authenticate on the [RuG Webhosting Gogs](https://git.w
|
||||||
| `secret.gogs.user` | username for the account | `p281392` |
|
| `secret.gogs.user` | username for the account | `p281392` |
|
||||||
| `secret.gogs.token` | token for the account | `xxxx` |
|
| `secret.gogs.token` | token for the account | `xxxx` |
|
||||||
|
|
||||||
|
|
||||||
|
#### Slack
|
||||||
|
The Slack integration is done mostly in the Jenkinsfile of each project. It is sufficient to only add the plugin to the Jenkins configuration in Helm.
|
||||||
|
|
||||||
#### Legacy:
|
#### Legacy:
|
||||||
|
|
||||||
##### Docker Hub
|
##### Docker Hub
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 133 KiB |
|
@ -1,3 +1,5 @@
|
||||||
|
# Helm in Jenkins
|
||||||
|
|
||||||
To be able to run helm inside a jenkins pod, you'll need to
|
To be able to run helm inside a jenkins pod, you'll need to
|
||||||
* create a role in the namespace where tiller is installed
|
* create a role in the namespace where tiller is installed
|
||||||
* bind that role to the user that jenkins pods run as
|
* bind that role to the user that jenkins pods run as
|
|
@ -14,6 +14,7 @@ jenkins:
|
||||||
- github-oauth:0.29
|
- github-oauth:0.29
|
||||||
- gogs-webhook:1.0.14
|
- gogs-webhook:1.0.14
|
||||||
- github-scm-trait-commit-skip:0.1.1
|
- github-scm-trait-commit-skip:0.1.1
|
||||||
|
- slack:2.3
|
||||||
Security:
|
Security:
|
||||||
UseGitHub: false
|
UseGitHub: false
|
||||||
GitHub:
|
GitHub:
|
||||||
|
@ -582,8 +583,42 @@ jenkins:
|
||||||
cpu: "1"
|
cpu: "1"
|
||||||
memory: "512Mi"
|
memory: "512Mi"
|
||||||
NodeSelector: {}
|
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:
|
secret:
|
||||||
# vault configures the vault secret
|
# vault configures the vault secret
|
||||||
vault:
|
vault:
|
||||||
|
@ -605,4 +640,4 @@ secret:
|
||||||
# dockerHubPassword contains password for hub.docker.com
|
# dockerHubPassword contains password for hub.docker.com
|
||||||
dockerHub:
|
dockerHub:
|
||||||
user: molgenisci
|
user: molgenisci
|
||||||
password: xxxx
|
password: xxxx
|
|
@ -5,4 +5,8 @@ name: molgenis-nexus
|
||||||
version: 0.4.2
|
version: 0.4.2
|
||||||
sources:
|
sources:
|
||||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
- 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
|
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
|
|
@ -61,4 +61,9 @@ To test if your hem chart works and:
|
||||||
|
|
||||||
To deploy it on the cluster.
|
To deploy it on the cluster.
|
||||||
|
|
||||||
|
```curl -L -u xxxx:xxxx http://registry.molgenis.org/repository/helm/ --upload-file molgenis-x.x.x.tgz```
|
||||||
|
|
||||||
|
To push it to the registry
|
||||||
|
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
|
@ -5,4 +5,8 @@ name: molgenis-opencpu
|
||||||
version: 0.1.1
|
version: 0.1.1
|
||||||
sources:
|
sources:
|
||||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
- 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
|
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
|
Before Width: | Height: | Size: 245 KiB After Width: | Height: | Size: 245 KiB |
|
@ -4,3 +4,7 @@ description: MOLGENIS vault
|
||||||
name: molgenis-vault
|
name: molgenis-vault
|
||||||
version: 0.1.1
|
version: 0.1.1
|
||||||
icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-vault/catalogIcon-molgenis-vault.svg
|
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
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
|
@ -70,10 +70,10 @@ ui:
|
||||||
# limits:
|
# limits:
|
||||||
# cpu: 100m
|
# cpu: 100m
|
||||||
# memory: 128Mi
|
# memory: 128Mi
|
||||||
#requests:
|
# requests:
|
||||||
# cpu: 100m
|
# cpu: 100m
|
||||||
# memory: 128Mi
|
# memory: 128Mi
|
||||||
nodeSelector: {}
|
nodeSelector: {}
|
||||||
vault:
|
vault:
|
||||||
auth: GITHUB
|
auth: GITHUB
|
||||||
url: https://vault.vault-operator:8200
|
url: https://vault.vault-operator:8200
|
|
@ -5,4 +5,8 @@ name: molgenis
|
||||||
version: 0.4.3
|
version: 0.4.3
|
||||||
sources:
|
sources:
|
||||||
- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
|
- 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
|
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
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
|
@ -64,12 +64,12 @@ elasticsearch:
|
||||||
javaOpts: "-Xms1g -Xmx1g"
|
javaOpts: "-Xms1g -Xmx1g"
|
||||||
clusterName: molgenis
|
clusterName: molgenis
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 2
|
cpu: 2
|
||||||
memory: 3Gi
|
memory: 3Gi
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
persistence:
|
persistence:
|
||||||
claim: elasticsearch-nfs-claim
|
claim: elasticsearch-nfs-claim
|
||||||
size: 5Gi
|
size: 5Gi
|