Compare commits
7 Commits
chore/node
...
revert/nod
Author | SHA1 | Date | |
---|---|---|---|
f6905334e1 | |||
f94e6da6e3 | |||
b73fd578ea | |||
486ab89b41 | |||
4e6349dacb | |||
4312e92860 | |||
02f7b7de1b |
@ -1,6 +1,6 @@
|
|||||||
name: molgenis-jenkins
|
name: molgenis-jenkins
|
||||||
home: https://jenkins.io/
|
home: https://jenkins.io/
|
||||||
version: 0.7.1
|
version: 0.8.0
|
||||||
appVersion: 2.121
|
appVersion: 2.121
|
||||||
description: Molgenis installation for the jenkins chart.
|
description: Molgenis installation for the jenkins chart.
|
||||||
sources:
|
sources:
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
jenkins:
|
jenkins:
|
||||||
Master:
|
Master:
|
||||||
NodeSelector:
|
|
||||||
deployPod: "true"
|
|
||||||
HostName: jenkins.molgenis.org
|
HostName: jenkins.molgenis.org
|
||||||
ServiceType: ClusterIP
|
ServiceType: ClusterIP
|
||||||
InstallPlugins:
|
InstallPlugins:
|
||||||
@ -16,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:
|
||||||
@ -491,9 +490,7 @@ jenkins:
|
|||||||
Command: cat
|
Command: cat
|
||||||
WorkingDir: /home/jenkins
|
WorkingDir: /home/jenkins
|
||||||
TTY: true
|
TTY: true
|
||||||
NodeSelector: {
|
NodeSelector: {}
|
||||||
deployPod: "true"
|
|
||||||
}
|
|
||||||
node:
|
node:
|
||||||
Label: node-carbon
|
Label: node-carbon
|
||||||
NodeUsageMode: EXCLUSIVE
|
NodeUsageMode: EXCLUSIVE
|
||||||
@ -523,9 +520,7 @@ jenkins:
|
|||||||
key: VAULT_ADDR
|
key: VAULT_ADDR
|
||||||
secretName: molgenis-pipeline-vault-secret
|
secretName: molgenis-pipeline-vault-secret
|
||||||
secretKey: addr
|
secretKey: addr
|
||||||
NodeSelector: {
|
NodeSelector: {}
|
||||||
deployPod: "true"
|
|
||||||
}
|
|
||||||
molgenis-it:
|
molgenis-it:
|
||||||
InheritFrom: molgenis
|
InheritFrom: molgenis
|
||||||
Label: molgenis-it
|
Label: molgenis-it
|
||||||
@ -587,9 +582,7 @@ jenkins:
|
|||||||
limits:
|
limits:
|
||||||
cpu: "1"
|
cpu: "1"
|
||||||
memory: "512Mi"
|
memory: "512Mi"
|
||||||
NodeSelector: {
|
NodeSelector: {}
|
||||||
deployPod: "true"
|
|
||||||
}
|
|
||||||
|
|
||||||
#secret contains configuration for the kubernetes secrets that jenkins can access
|
#secret contains configuration for the kubernetes secrets that jenkins can access
|
||||||
secret:
|
secret:
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,7 +31,5 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- containerPort: {{ .service.port }}
|
- containerPort: {{ .service.port }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.nodeSelector }}
|
|
||||||
nodeSelector:
|
|
||||||
{{ toYaml . | indent 8 }}
|
|
||||||
{{- end }}
|
|
||||||
|
@ -34,9 +34,7 @@ ingress:
|
|||||||
- name: opencpu.molgenis.org
|
- name: opencpu.molgenis.org
|
||||||
tls: []
|
tls: []
|
||||||
|
|
||||||
nodeSelector: {
|
nodeSelector: {}
|
||||||
deployPod: "true"
|
|
||||||
}
|
|
||||||
|
|
||||||
tolerations: []
|
tolerations: []
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ Parameter | Description | Default
|
|||||||
`ui.image.repository` | Vault UI container image repository | `djenriquez/vault-ui`
|
`ui.image.repository` | Vault UI container image repository | `djenriquez/vault-ui`
|
||||||
`ui.image.tag` | Vault UI container image tag | `latest`
|
`ui.image.tag` | Vault UI container image tag | `latest`
|
||||||
`ui.resources` | Vault UI pod resource requests & limits | `{}`
|
`ui.resources` | Vault UI pod resource requests & limits | `{}`
|
||||||
`ui.nodeSelector` | node labels for Vault UI pod assignment | `{deployPod: "true"}`
|
`ui.nodeSelector` | node labels for Vault UI pod assignment | `{}`
|
||||||
`ui.ingress.enabled` | If true, Vault UI Ingress will be created | `true`
|
`ui.ingress.enabled` | If true, Vault UI Ingress will be created | `true`
|
||||||
`ui.ingress.annotations` | Vault UI Ingress annotations | `{}`
|
`ui.ingress.annotations` | Vault UI Ingress annotations | `{}`
|
||||||
`ui.ingress.host` | Vault UI Ingress hostname | `vault.molgenis.org`
|
`ui.ingress.host` | Vault UI Ingress hostname | `vault.molgenis.org`
|
||||||
|
@ -18,10 +18,6 @@ backupJob:
|
|||||||
# schedule gives the cron schedule for the backup job
|
# schedule gives the cron schedule for the backup job
|
||||||
schedule: "0 12 * * 1"
|
schedule: "0 12 * * 1"
|
||||||
|
|
||||||
vault-operator:
|
|
||||||
nodeSelector:
|
|
||||||
deployPod: "true"
|
|
||||||
|
|
||||||
###
|
###
|
||||||
# All of the config variables related to setting up the etcd-operator
|
# All of the config variables related to setting up the etcd-operator
|
||||||
# If you want more information about the variables exposed, please visit:
|
# If you want more information about the variables exposed, please visit:
|
||||||
@ -48,8 +44,6 @@ etcd-operator:
|
|||||||
restoreOperator:
|
restoreOperator:
|
||||||
image:
|
image:
|
||||||
tag: v0.9.2
|
tag: v0.9.2
|
||||||
nodeSelector:
|
|
||||||
deployPod: "true"
|
|
||||||
|
|
||||||
ui:
|
ui:
|
||||||
name: "vault-ui"
|
name: "vault-ui"
|
||||||
@ -79,8 +73,7 @@ ui:
|
|||||||
#requests:
|
#requests:
|
||||||
# cpu: 100m
|
# cpu: 100m
|
||||||
# memory: 128Mi
|
# memory: 128Mi
|
||||||
nodeSelector:
|
nodeSelector: {}
|
||||||
deployPod: "true"
|
|
||||||
vault:
|
vault:
|
||||||
auth: GITHUB
|
auth: GITHUB
|
||||||
url: https://vault.vault-operator:8200
|
url: https://vault.vault-operator:8200
|
@ -94,8 +94,9 @@ persistence:
|
|||||||
enabled: true
|
enabled: true
|
||||||
retain: false
|
retain: false
|
||||||
|
|
||||||
nodeSelector:
|
nodeSelector: {
|
||||||
deployPod: "true"
|
deployPod: "true"
|
||||||
|
}
|
||||||
|
|
||||||
tolerations: []
|
tolerations: []
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user