diff --git a/jenkins/v0.1.x/catalogIcon-molgenis-jenkins.svg b/jenkins/catalogIcon-molgenis-jenkins.svg similarity index 100% rename from jenkins/v0.1.x/catalogIcon-molgenis-jenkins.svg rename to jenkins/catalogIcon-molgenis-jenkins.svg diff --git a/jenkins/v0.2.x/Chart.yaml b/jenkins/v0.2.x/Chart.yaml index 1c6217e..4c43ecc 100755 --- a/jenkins/v0.2.x/Chart.yaml +++ b/jenkins/v0.2.x/Chart.yaml @@ -1,16 +1,10 @@ name: jenkins home: https://jenkins.io/ -version: 0.16.3 +version: 0.2.0 appVersion: 2.107 description: Open source continuous integration server. It supports multiple SCM tools including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based projects as well as arbitrary scripts. sources: -- https://github.com/jenkinsci/jenkins -- https://github.com/jenkinsci/docker-jnlp-slave -maintainers: -- name: lachie83 - email: lachlan.evenson@microsoft.com -- name: viglesiasce - email: viglesias@google.com -icon: https://wiki.jenkins-ci.org/download/attachments/2916393/logo.png +- https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git +icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/jenkins/catalogIcon-molgenis-jenkins.svg diff --git a/jenkins/v0.2.x/OWNERS b/jenkins/v0.2.x/OWNERS deleted file mode 100644 index f5544ea..0000000 --- a/jenkins/v0.2.x/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- lachie83 -- viglesiasce -reviewers: -- lachie83 -- viglesiasce diff --git a/jenkins/v0.2.x/README.md b/jenkins/v0.2.x/README.md index 9984979..23702f3 100644 --- a/jenkins/v0.2.x/README.md +++ b/jenkins/v0.2.x/README.md @@ -10,20 +10,21 @@ Inspired by the awesome work of Carlos Sanchez This chart will do the following: -* 1 x Jenkins Master with port 8080 exposed on an external LoadBalancer +* 1 x Jenkins Master with port 8080 exposed on an external ClusterIP * All using Kubernetes Deployments ## Installing the Chart -To install the chart with the release name `my-release`: - -```bash -$ helm install --name my-release stable/jenkins -``` +In the rancher UI, choose the molgenis-jenkins app from the catalog and deploy it. ## Configuration The following tables list the configurable parameters of the Jenkins chart and their default values. +You can paste these values into the Rancher Answers if you like. +Array values can be added as {value, value, value}, e.g. +``` +Master.InstallPlugins={kubernetes:1.8.4, workflow-aggregator:2.5, workflow-job:2.21, credentials-binding:1.16, git:3.9.1} +``` ### Jenkins Master | Parameter | Description | Default | diff --git a/jenkins/v0.2.x/values.yaml b/jenkins/v0.2.x/values.yaml index f94f258..f65e91b 100644 --- a/jenkins/v0.2.x/values.yaml +++ b/jenkins/v0.2.x/values.yaml @@ -38,12 +38,13 @@ Master: ServicePort: 8080 # For minikube, set this to NodePort, elsewhere use LoadBalancer # Use ClusterIP if your setup includes ingress controller - ServiceType: LoadBalancer + ServiceType: ClusterIP # Master Service annotations ServiceAnnotations: {} # service.beta.kubernetes.io/aws-load-balancer-backend-protocol: https # Used to create Ingress record (should used with ServiceType: ClusterIP) # HostName: jenkins.cluster.local + HostName: jenkins.molgenis.org # NodePort: > +# Jobs: |- +# molgenis: |- +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# false +# +# +# +# +# +# +# true +# -1 +# -1 +# +# +# false +# +# +# +# +# a1f535cd-ab83-4d42-8993-0c3e59cf139f +# http://github.com/molgenis/molgenis.git +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# Jenkinsfile +# +# CustomConfigMap: false # Node labels and tolerations for pod assignment # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector @@ -143,7 +197,7 @@ Agent: # jenkins-agent: v1 Persistence: - Enabled: true + Enabled: false ## A manually managed Persistent Volume and Claim ## Requires Persistence.Enabled: true ## If defined, PVC must be created manually before volume will be bound