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
|
||||
home: https://jenkins.io/
|
||||
version: 0.7.1
|
||||
version: 0.8.0
|
||||
appVersion: 2.121
|
||||
description: Molgenis installation for the jenkins chart.
|
||||
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.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:
|
||||
|
||||
##### Docker Hub
|
||||
|
@ -1,3 +1,5 @@
|
||||
# Helm in Jenkins
|
||||
|
||||
To be able to run helm inside a jenkins pod, you'll need to
|
||||
* create a role in the namespace where tiller is installed
|
||||
* bind that role to the user that jenkins pods run as
|
||||
|
@ -1,7 +1,5 @@
|
||||
jenkins:
|
||||
Master:
|
||||
NodeSelector:
|
||||
deployPod: "true"
|
||||
HostName: jenkins.molgenis.org
|
||||
ServiceType: ClusterIP
|
||||
InstallPlugins:
|
||||
@ -16,6 +14,7 @@ jenkins:
|
||||
- github-oauth:0.29
|
||||
- gogs-webhook:1.0.14
|
||||
- github-scm-trait-commit-skip:0.1.1
|
||||
- slack:2.3
|
||||
Security:
|
||||
UseGitHub: false
|
||||
GitHub:
|
||||
@ -491,9 +490,7 @@ jenkins:
|
||||
Command: cat
|
||||
WorkingDir: /home/jenkins
|
||||
TTY: true
|
||||
NodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
NodeSelector: {}
|
||||
node:
|
||||
Label: node-carbon
|
||||
NodeUsageMode: EXCLUSIVE
|
||||
@ -523,9 +520,7 @@ jenkins:
|
||||
key: VAULT_ADDR
|
||||
secretName: molgenis-pipeline-vault-secret
|
||||
secretKey: addr
|
||||
NodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
NodeSelector: {}
|
||||
molgenis-it:
|
||||
InheritFrom: molgenis
|
||||
Label: molgenis-it
|
||||
@ -587,9 +582,7 @@ jenkins:
|
||||
limits:
|
||||
cpu: "1"
|
||||
memory: "512Mi"
|
||||
NodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
NodeSelector: {}
|
||||
|
||||
#secret contains configuration for the kubernetes secrets that jenkins can access
|
||||
secret:
|
||||
|
@ -61,4 +61,9 @@ To test if your hem chart works and:
|
||||
|
||||
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:
|
||||
- containerPort: {{ .service.port }}
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{ toYaml . | indent 8 }}
|
||||
{{- end }}
|
||||
|
||||
|
||||
|
@ -34,9 +34,7 @@ ingress:
|
||||
- name: opencpu.molgenis.org
|
||||
tls: []
|
||||
|
||||
nodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
nodeSelector: {}
|
||||
|
||||
tolerations: []
|
||||
|
||||
|
@ -38,7 +38,7 @@ Parameter | Description | Default
|
||||
`ui.image.repository` | Vault UI container image repository | `djenriquez/vault-ui`
|
||||
`ui.image.tag` | Vault UI container image tag | `latest`
|
||||
`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.annotations` | Vault UI Ingress annotations | `{}`
|
||||
`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: "0 12 * * 1"
|
||||
|
||||
vault-operator:
|
||||
nodeSelector:
|
||||
deployPod: "true"
|
||||
|
||||
###
|
||||
# All of the config variables related to setting up the etcd-operator
|
||||
# If you want more information about the variables exposed, please visit:
|
||||
@ -48,8 +44,6 @@ etcd-operator:
|
||||
restoreOperator:
|
||||
image:
|
||||
tag: v0.9.2
|
||||
nodeSelector:
|
||||
deployPod: "true"
|
||||
|
||||
ui:
|
||||
name: "vault-ui"
|
||||
@ -79,8 +73,7 @@ ui:
|
||||
#requests:
|
||||
# cpu: 100m
|
||||
# memory: 128Mi
|
||||
nodeSelector:
|
||||
deployPod: "true"
|
||||
nodeSelector: {}
|
||||
vault:
|
||||
auth: GITHUB
|
||||
url: https://vault.vault-operator:8200
|
@ -94,8 +94,9 @@ persistence:
|
||||
enabled: true
|
||||
retain: false
|
||||
|
||||
nodeSelector:
|
||||
nodeSelector: {
|
||||
deployPod: "true"
|
||||
}
|
||||
|
||||
tolerations: []
|
||||
|
||||
|
Reference in New Issue
Block a user