From 1a7b201aba3ff90c9654005dc9aac2d01e68b649 Mon Sep 17 00:00:00 2001 From: sido Date: Mon, 25 Jun 2018 22:53:22 +0200 Subject: [PATCH] updated versions --- httpd/{v0.1.0 => v0.1.x}/.helmignore | 0 httpd/{v0.1.0 => v0.1.x}/Chart.yaml | 0 httpd/{v0.1.0 => v0.1.x}/questions.yml | 19 ++---- httpd/{v0.1.0 => v0.1.x}/templates/NOTES.txt | 0 .../{v0.1.0 => v0.1.x}/templates/_helpers.tpl | 0 .../templates/deployment.yaml | 0 .../{v0.1.0 => v0.1.x}/templates/ingress.yaml | 0 .../{v0.1.0 => v0.1.x}/templates/service.yaml | 0 httpd/{v0.1.0 => v0.1.x}/values.yaml | 0 jenkins/{v1.0.0 => v0.1.x}/.helmignore | 0 jenkins/{v1.0.0 => v0.1.x}/Chart.yaml | 0 .../catalogIcon-molgenis-jenkins.svg | 0 jenkins/v0.1.x/templates/_helpers.tpl | 32 +++++++++ .../deployment/jenkins-agent-deployment.yaml | 38 +++++++++++ .../deployment/jenkins-master-deployment.yaml | 41 +++++++++++ jenkins/v0.1.x/templates/ingress.yaml | 36 ++++++++++ .../services/jenkins-agent-service.yaml | 13 ++++ .../services/jenkins-master-service.yaml | 13 ++++ .../templates/volumes/jenkins-agent-pvc.yaml | 0 .../templates/volumes/jenkins-master-pvc.yaml | 0 jenkins/v0.1.x/values.yaml | 68 +++++++++++++++++++ .../deployment/jenkins-agent-deployment.yaml | 39 ----------- .../deployment/jenkins-master-deployment.yaml | 40 ----------- jenkins/v1.0.0/templates/ingress.yaml | 12 ---- .../services/jenkins-agent-service.yaml | 19 ------ .../services/jenkins-master-service.yaml | 19 ------ jenkins/v1.0.0/values.yaml | 45 ------------ nexus/{v1.0.0 => v0.1.x}/.helmignore | 0 nexus/{v1.0.0 => v0.1.x}/Chart.yaml | 0 .../catalogIcon-molgenis-nexus.svg | 0 .../{v1.0.0 => v0.1.x}/templates/_helpers.tpl | 0 .../deployments/httpd-deployment.yaml | 9 +-- .../deployments/nexus-deployment.yaml | 4 +- .../{v1.0.0 => v0.1.x}/templates/ingress.yaml | 0 .../templates/services/httpd-service.yaml | 0 .../templates/services/nexus-service.yaml | 0 .../templates/volumes/nexus-pv.yaml | 0 .../templates/volumes/nexus-pvc.yaml | 0 nexus/{v1.0.0 => v0.1.x}/values.yaml | 8 +++ 39 files changed, 262 insertions(+), 193 deletions(-) rename httpd/{v0.1.0 => v0.1.x}/.helmignore (100%) rename httpd/{v0.1.0 => v0.1.x}/Chart.yaml (100%) rename httpd/{v0.1.0 => v0.1.x}/questions.yml (80%) rename httpd/{v0.1.0 => v0.1.x}/templates/NOTES.txt (100%) rename httpd/{v0.1.0 => v0.1.x}/templates/_helpers.tpl (100%) rename httpd/{v0.1.0 => v0.1.x}/templates/deployment.yaml (100%) rename httpd/{v0.1.0 => v0.1.x}/templates/ingress.yaml (100%) rename httpd/{v0.1.0 => v0.1.x}/templates/service.yaml (100%) rename httpd/{v0.1.0 => v0.1.x}/values.yaml (100%) rename jenkins/{v1.0.0 => v0.1.x}/.helmignore (100%) rename jenkins/{v1.0.0 => v0.1.x}/Chart.yaml (100%) rename jenkins/{v1.0.0 => v0.1.x}/catalogIcon-molgenis-jenkins.svg (100%) create mode 100644 jenkins/v0.1.x/templates/_helpers.tpl create mode 100644 jenkins/v0.1.x/templates/deployment/jenkins-agent-deployment.yaml create mode 100644 jenkins/v0.1.x/templates/deployment/jenkins-master-deployment.yaml create mode 100644 jenkins/v0.1.x/templates/ingress.yaml create mode 100644 jenkins/v0.1.x/templates/services/jenkins-agent-service.yaml create mode 100644 jenkins/v0.1.x/templates/services/jenkins-master-service.yaml rename jenkins/{v1.0.0 => v0.1.x}/templates/volumes/jenkins-agent-pvc.yaml (100%) rename jenkins/{v1.0.0 => v0.1.x}/templates/volumes/jenkins-master-pvc.yaml (100%) create mode 100644 jenkins/v0.1.x/values.yaml delete mode 100644 jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml delete mode 100644 jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml delete mode 100644 jenkins/v1.0.0/templates/ingress.yaml delete mode 100644 jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml delete mode 100644 jenkins/v1.0.0/templates/services/jenkins-master-service.yaml delete mode 100644 jenkins/v1.0.0/values.yaml rename nexus/{v1.0.0 => v0.1.x}/.helmignore (100%) rename nexus/{v1.0.0 => v0.1.x}/Chart.yaml (100%) rename nexus/{v1.0.0 => v0.1.x}/catalogIcon-molgenis-nexus.svg (100%) rename nexus/{v1.0.0 => v0.1.x}/templates/_helpers.tpl (100%) rename nexus/{v1.0.0 => v0.1.x}/templates/deployments/httpd-deployment.yaml (82%) rename nexus/{v1.0.0 => v0.1.x}/templates/deployments/nexus-deployment.yaml (90%) rename nexus/{v1.0.0 => v0.1.x}/templates/ingress.yaml (100%) rename nexus/{v1.0.0 => v0.1.x}/templates/services/httpd-service.yaml (100%) rename nexus/{v1.0.0 => v0.1.x}/templates/services/nexus-service.yaml (100%) rename nexus/{v1.0.0 => v0.1.x}/templates/volumes/nexus-pv.yaml (100%) rename nexus/{v1.0.0 => v0.1.x}/templates/volumes/nexus-pvc.yaml (100%) rename nexus/{v1.0.0 => v0.1.x}/values.yaml (91%) diff --git a/httpd/v0.1.0/.helmignore b/httpd/v0.1.x/.helmignore similarity index 100% rename from httpd/v0.1.0/.helmignore rename to httpd/v0.1.x/.helmignore diff --git a/httpd/v0.1.0/Chart.yaml b/httpd/v0.1.x/Chart.yaml similarity index 100% rename from httpd/v0.1.0/Chart.yaml rename to httpd/v0.1.x/Chart.yaml diff --git a/httpd/v0.1.0/questions.yml b/httpd/v0.1.x/questions.yml similarity index 80% rename from httpd/v0.1.0/questions.yml rename to httpd/v0.1.x/questions.yml index 5af3f18..5f10bd2 100644 --- a/httpd/v0.1.0/questions.yml +++ b/httpd/v0.1.x/questions.yml @@ -34,20 +34,13 @@ questions: description: "If undefined or null, uses the default StorageClass. Default to null" type: storageclass label: Default StorageClass for MOLGENIS -- variable: ingress.enabled - default: "true" - description: "Expose app using Layer 7 Load Balancer - ingress" - type: boolean - label: Expose app using Layer 7 Load Balancer - show_subquestion_if: true +- variable: ingress.hosts[0].name + default: "test.molgenis.org" + description: "Hostname for your stack" + type: hostname + required: true group: "Services and Load Balancing" - subquestions: - - variable: ingress.hosts[0].name - default: "test.molgenis.org" - description: "Hostname for your stack" - type: hostname - required: true - label: Hostname + label: Hostname - variable: httpd.hostname default: "test.molgenis.org" description: "Hostname for your services (comma separated, example: [hostname]:[port])" diff --git a/httpd/v0.1.0/templates/NOTES.txt b/httpd/v0.1.x/templates/NOTES.txt similarity index 100% rename from httpd/v0.1.0/templates/NOTES.txt rename to httpd/v0.1.x/templates/NOTES.txt diff --git a/httpd/v0.1.0/templates/_helpers.tpl b/httpd/v0.1.x/templates/_helpers.tpl similarity index 100% rename from httpd/v0.1.0/templates/_helpers.tpl rename to httpd/v0.1.x/templates/_helpers.tpl diff --git a/httpd/v0.1.0/templates/deployment.yaml b/httpd/v0.1.x/templates/deployment.yaml similarity index 100% rename from httpd/v0.1.0/templates/deployment.yaml rename to httpd/v0.1.x/templates/deployment.yaml diff --git a/httpd/v0.1.0/templates/ingress.yaml b/httpd/v0.1.x/templates/ingress.yaml similarity index 100% rename from httpd/v0.1.0/templates/ingress.yaml rename to httpd/v0.1.x/templates/ingress.yaml diff --git a/httpd/v0.1.0/templates/service.yaml b/httpd/v0.1.x/templates/service.yaml similarity index 100% rename from httpd/v0.1.0/templates/service.yaml rename to httpd/v0.1.x/templates/service.yaml diff --git a/httpd/v0.1.0/values.yaml b/httpd/v0.1.x/values.yaml similarity index 100% rename from httpd/v0.1.0/values.yaml rename to httpd/v0.1.x/values.yaml diff --git a/jenkins/v1.0.0/.helmignore b/jenkins/v0.1.x/.helmignore similarity index 100% rename from jenkins/v1.0.0/.helmignore rename to jenkins/v0.1.x/.helmignore diff --git a/jenkins/v1.0.0/Chart.yaml b/jenkins/v0.1.x/Chart.yaml similarity index 100% rename from jenkins/v1.0.0/Chart.yaml rename to jenkins/v0.1.x/Chart.yaml diff --git a/jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg b/jenkins/v0.1.x/catalogIcon-molgenis-jenkins.svg similarity index 100% rename from jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg rename to jenkins/v0.1.x/catalogIcon-molgenis-jenkins.svg diff --git a/jenkins/v0.1.x/templates/_helpers.tpl b/jenkins/v0.1.x/templates/_helpers.tpl new file mode 100644 index 0000000..3f5c197 --- /dev/null +++ b/jenkins/v0.1.x/templates/_helpers.tpl @@ -0,0 +1,32 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "jenkins.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "jenkins.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "jenkins.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/jenkins/v0.1.x/templates/deployment/jenkins-agent-deployment.yaml b/jenkins/v0.1.x/templates/deployment/jenkins-agent-deployment.yaml new file mode 100644 index 0000000..5f3cf57 --- /dev/null +++ b/jenkins/v0.1.x/templates/deployment/jenkins-agent-deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + creationTimestamp: null + name: {{ .Values.jenkins.agent.name }} + labels: + app: {{ .Values.jenkins.agent.name }} + environment: {{ .Values.environment }} +spec: + replicas: {{ .Values.replicaCount}} + strategy: + type: {{ .Values.jenkins.strategy.type }} + selector: + matchLabels: + app: {{ .Values.jenkins.agent.selector }} + template: + metadata: + labels: + app: {{ .Values.jenkins.agent.name }} + creationTimestamp: null + spec: + restartPolicy: {{ .Values.agent.restartPolicy }} + containers: + - name: {{ .Values.jenkins.agent.name }} + image: "{{ .Values.jenkins.agent.image.repository }}:{{ .Values.jenkins.agent.image.tag }}" + imagePullPolicy: {{ .Values.jenkins.agent.image.pullPolicy }} + - name: JENKINS_SLAVE_SSH_PUBKEY + value: {{ .Values.jenkins.agent.ssh.public.key }} + ports: + - containerPort: {{ .Values.jenkins.agent.port }} + volumeMounts: + - mountPath: /var/run/docker.sock + name: jenkins-agent-worker-claim + volumes: + - name: jenkins-agent-worker-claim + persistentVolumeClaim: + claimName: jenkins-agent-worker-claim + diff --git a/jenkins/v0.1.x/templates/deployment/jenkins-master-deployment.yaml b/jenkins/v0.1.x/templates/deployment/jenkins-master-deployment.yaml new file mode 100644 index 0000000..a689ada --- /dev/null +++ b/jenkins/v0.1.x/templates/deployment/jenkins-master-deployment.yaml @@ -0,0 +1,41 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + creationTimestamp: null + name: {{ .Values.jenkins.master.name }} + labels: + app: {{ .Values.jenkins.master.name }} + environment: {{ .Values.environment }} +spec: + replicas: {{ .Values.replicaCount}} + strategy: + type: {{ .Values.jenkins.strategy.type }} + selector: + matchLabels: + app: {{ .Values.jenkins.master.selector }} + template: + metadata: + labels: + app: {{ .Values.jenkins.master.name }} + creationTimestamp: null + spec: + restartPolicy: {{ .Values.jenkins.restartPolicy }} + containers: + - name: {{ .Values.jenkins.master.name }} + image: "{{ .Values.jenkins.master.image.repository }}:{{ .Values.jenkins.master.image.tag }}" + imagePullPolicy: {{ .Values.jenkins.master.image.pullPolicy }} + - env: + - name: JENKINS_ADMIN_PASS + - name: JENKINS_ADMIN_USER + ports: + - containerPort: {{ .Values.jenkins.master.port }} + resources: {} + volumeMounts: + - name: jenkins-master-claim + mountPath: /var/jenkins-home + - name: jenkins-master-claim + mountPath: /var/run/docker.sock + volumes: + - name: jenkins-master-claim + persistentVolumeClaim: + claimName: jenkins-master-claim diff --git a/jenkins/v0.1.x/templates/ingress.yaml b/jenkins/v0.1.x/templates/ingress.yaml new file mode 100644 index 0000000..871dda3 --- /dev/null +++ b/jenkins/v0.1.x/templates/ingress.yaml @@ -0,0 +1,36 @@ +{{- if .Values.ingress.enabled }} +{{- range .Values.ingress.hosts }} +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: "{{ $.Release.Name }}-ingress" + labels: + app: {{ template "jenkins.fullname" $ }} + chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" + release: "{{ $.Release.Name }}" + heritage: "{{ $.Release.Service }}" + annotations: + {{- if .tls }} + ingress.kubernetes.io/secure-backends: "true" + {{- end }} + {{- range $key, $value := .annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} +spec: + rules: + - host: {{ .name }} + http: + paths: + - path: {{ default "/" .path }} + backend: + serviceName: {{ template "jenkins.fullname" $ }} + servicePort: 80 +{{- if .tls }} + tls: + - hosts: + - {{ .name }} + secretName: {{ .tlsSecret }} +{{- end }} +--- +{{- end }} +{{- end }} \ No newline at end of file diff --git a/jenkins/v0.1.x/templates/services/jenkins-agent-service.yaml b/jenkins/v0.1.x/templates/services/jenkins-agent-service.yaml new file mode 100644 index 0000000..e7689a9 --- /dev/null +++ b/jenkins/v0.1.x/templates/services/jenkins-agent-service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.jenkins.agent.name }} + labels: + app: {{ .Values.jenkins.agent.name }} +spec: + type: NodePort + ports: + - name: {{ .Values.jenkins.agent.name }} + port: {{ .Values.jenkins.agent.port }} + selector: + app: {{ .Values.jenkins.agent.selector }} \ No newline at end of file diff --git a/jenkins/v0.1.x/templates/services/jenkins-master-service.yaml b/jenkins/v0.1.x/templates/services/jenkins-master-service.yaml new file mode 100644 index 0000000..20b83f7 --- /dev/null +++ b/jenkins/v0.1.x/templates/services/jenkins-master-service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.jenkins.master.name }} + labels: + app: {{ .Values.jenkins.master.name }} +spec: + type: NodePort + ports: + - name: {{ .Values.jenkins.master.name }} + port: {{ .Values.jenkins.master.port }} + selector: + app: {{ .Values.jenkins.master.selector }} \ No newline at end of file diff --git a/jenkins/v1.0.0/templates/volumes/jenkins-agent-pvc.yaml b/jenkins/v0.1.x/templates/volumes/jenkins-agent-pvc.yaml similarity index 100% rename from jenkins/v1.0.0/templates/volumes/jenkins-agent-pvc.yaml rename to jenkins/v0.1.x/templates/volumes/jenkins-agent-pvc.yaml diff --git a/jenkins/v1.0.0/templates/volumes/jenkins-master-pvc.yaml b/jenkins/v0.1.x/templates/volumes/jenkins-master-pvc.yaml similarity index 100% rename from jenkins/v1.0.0/templates/volumes/jenkins-master-pvc.yaml rename to jenkins/v0.1.x/templates/volumes/jenkins-master-pvc.yaml diff --git a/jenkins/v0.1.x/values.yaml b/jenkins/v0.1.x/values.yaml new file mode 100644 index 0000000..86ba0d7 --- /dev/null +++ b/jenkins/v0.1.x/values.yaml @@ -0,0 +1,68 @@ +# Default values for jenkins. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +environment: production + +service: + type: NodePort + port: 8080 + +jenkins: + strategy: + type: Recreate + restartPolicy: Always + master: + name: jenkins-master + selector: jenkins-master + image: + repository: registry.webhosting.rug.nl/molgenis/jenkins-master + tag: lts + pullPolicy: Always + port: 8080 + agent: + name: jenkins-agent + selector: jenkins-agent + image: + repository: registry.webhosting.rug.nl/molgenis/jenkins-agent + tag: lts + pullPolicy: Always + port: 22 + ssh: + public: + key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6+L3I5Dh1oKCxRktAhKwX20vQq5+hp40D2HCN+JSOT1WmiZOKQQ2U73HyRlukXV1MJGn6NM0pZS1W12IiAiSeu6xl+YFlEJykRK+9NnpSGwTMXXirCmCyWAlMUb6pcXmCqa1Pk1HqiUUfvflkvFHNT+26LBNXj0LbrT6KFd0xhm/KH9gMTKnYoBQqezE7D5jjPki5lKAfBL7IQkwgs5wFdaQicRYAUsuI7gV6EsDgVmLmF6f2d8+/AJ0fwYIFpzaYqQfgrpilMCvHXcuskpHj2RtJFMiPZ4WZSMZ3sMTD0MmZxdNU32qc/TR7mILHEB9/10EzmE4F7X1NdWYeJqK5VKH8RfwLHtiFDPPoqttc2AuaMrSPiRJxtww0oLsEN3toE9qauXpVcJUgaxpj0hE7UQP026Et3LZDQCD8w+3VPVUCfGHy7LTZdPzxDYuWmSMGF/VjYYKbv3WgPEVomRdB1TlaSEb8JfnHI1CVo4C+dImwxppVRbiAkjK/D+TnTavgx+zl85Fo1oNO49kjg9Avp2sOoHBSCBk6ceywIdvvaIzQSxQZfj3PbSWRg+ywJMS8tM6m6riEQola8EmHA7pP/Aj70453ip08MUnz1vsM/e396nqdw55KhR5dPEPHrfqmONMgr6IUa+6zyeWBQ7LTpkWztQ4lQcPl48jRE0ijTQ== sido@client-145-100-225-240.surfnet.eduroam.rug.nl + + + +ingress: + enabled: true + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + path: / + hosts: + - registry.molgenis.org + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml b/jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml deleted file mode 100644 index 6e58cad..0000000 --- a/jenkins/v1.0.0/templates/deployment/jenkins-agent-deployment.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.13.0 () - creationTimestamp: null - labels: - io.kompose.service: jenkins-agent-worker - name: jenkins-agent-worker -spec: - replicas: 1 - strategy: - type: Recreate - template: - metadata: - creationTimestamp: null - labels: - io.kompose.service: jenkins-agent-worker - spec: - containers: - - env: - - name: JENKINS_SLAVE_SSH_PUBKEY - value: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6+L3I5Dh1oKCxRktAhKwX20vQq5+hp40D2HCN+JSOT1WmiZOKQQ2U73HyRlukXV1MJGn6NM0pZS1W12IiAiSeu6xl+YFlEJykRK+9NnpSGwTMXXirCmCyWAlMUb6pcXmCqa1Pk1HqiUUfvflkvFHNT+26LBNXj0LbrT6KFd0xhm/KH9gMTKnYoBQqezE7D5jjPki5lKAfBL7IQkwgs5wFdaQicRYAUsuI7gV6EsDgVmLmF6f2d8+/AJ0fwYIFpzaYqQfgrpilMCvHXcuskpHj2RtJFMiPZ4WZSMZ3sMTD0MmZxdNU32qc/TR7mILHEB9/10EzmE4F7X1NdWYeJqK5VKH8RfwLHtiFDPPoqttc2AuaMrSPiRJxtww0oLsEN3toE9qauXpVcJUgaxpj0hE7UQP026Et3LZDQCD8w+3VPVUCfGHy7LTZdPzxDYuWmSMGF/VjYYKbv3WgPEVomRdB1TlaSEb8JfnHI1CVo4C+dImwxppVRbiAkjK/D+TnTavgx+zl85Fo1oNO49kjg9Avp2sOoHBSCBk6ceywIdvvaIzQSxQZfj3PbSWRg+ywJMS8tM6m6riEQola8EmHA7pP/Aj70453ip08MUnz1vsM/e396nqdw55KhR5dPEPHrfqmONMgr6IUa+6zyeWBQ7LTpkWztQ4lQcPl48jRE0ijTQ== - sido@client-145-100-225-240.surfnet.eduroam.rug.nl - image: registry.molgenis.org/molgenis-ops-releases/jenkins-agent-worker:lts - name: jenkins-agent-worker - ports: - - containerPort: 22 - resources: {} - volumeMounts: - - mountPath: /var/run/docker.sock - name: jenkins-agent-worker-claim - restartPolicy: Always - volumes: - - name: jenkins-agent-worker-claim - persistentVolumeClaim: - claimName: jenkins-agent-worker-claim -status: {} diff --git a/jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml b/jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml deleted file mode 100644 index 6a2f042..0000000 --- a/jenkins/v1.0.0/templates/deployment/jenkins-master-deployment.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.13.0 () - creationTimestamp: null - labels: - io.kompose.service: jenkins-master - name: jenkins-master -spec: - replicas: 1 - strategy: - type: Recreate - template: - metadata: - creationTimestamp: null - labels: - io.kompose.service: jenkins-master - spec: - containers: - - env: - - name: JENKINS_ADMIN_PASS - - name: JENKINS_ADMIN_USER - image: registry.molgenis.org/molgenis-ops-releases/jenkins-master:lts - name: jenkins-master - ports: - - containerPort: 8080 - resources: {} - volumeMounts: - - mountPath: /var/jenkins-home - name: jenkins-master-claim - - mountPath: /var/run/docker.sock - name: jenkins-master-claim - restartPolicy: Always - volumes: - - name: jenkins-master-claim - persistentVolumeClaim: - claimName: jenkins-master-claim -status: {} diff --git a/jenkins/v1.0.0/templates/ingress.yaml b/jenkins/v1.0.0/templates/ingress.yaml deleted file mode 100644 index 91a6c39..0000000 --- a/jenkins/v1.0.0/templates/ingress.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: ingress-${SERVICE} -spec: - rules: - - host: ${SITENAME} - http: - paths: - - backend: - serviceName: ${SERVICE} - servicePort: 80 \ No newline at end of file diff --git a/jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml b/jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml deleted file mode 100644 index 3b4247f..0000000 --- a/jenkins/v1.0.0/templates/services/jenkins-agent-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.13.0 () - creationTimestamp: null - labels: - io.kompose.service: jenkins-agent-worker - name: jenkins-agent-worker -spec: - ports: - - name: "22" - port: 22 - targetPort: 22 - selector: - io.kompose.service: jenkins-agent-worker -status: - loadBalancer: {} diff --git a/jenkins/v1.0.0/templates/services/jenkins-master-service.yaml b/jenkins/v1.0.0/templates/services/jenkins-master-service.yaml deleted file mode 100644 index 52e5994..0000000 --- a/jenkins/v1.0.0/templates/services/jenkins-master-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert - kompose.version: 1.13.0 () - creationTimestamp: null - labels: - io.kompose.service: jenkins-master - name: jenkins-master -spec: - ports: - - name: "8080" - port: 8080 - targetPort: 8080 - selector: - io.kompose.service: jenkins-master -status: - loadBalancer: {} diff --git a/jenkins/v1.0.0/values.yaml b/jenkins/v1.0.0/values.yaml deleted file mode 100644 index bbe65db..0000000 --- a/jenkins/v1.0.0/values.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# Default values for jenkins. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: registry.molgenis.org/molgenis-ops-releases/jenkins-master:lts - tag: lts - pullPolicy: Always - -service: - type: ClusterIP - port: 8080 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - path: / - hosts: - - registry.molgenis.org - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/nexus/v1.0.0/.helmignore b/nexus/v0.1.x/.helmignore similarity index 100% rename from nexus/v1.0.0/.helmignore rename to nexus/v0.1.x/.helmignore diff --git a/nexus/v1.0.0/Chart.yaml b/nexus/v0.1.x/Chart.yaml similarity index 100% rename from nexus/v1.0.0/Chart.yaml rename to nexus/v0.1.x/Chart.yaml diff --git a/nexus/v1.0.0/catalogIcon-molgenis-nexus.svg b/nexus/v0.1.x/catalogIcon-molgenis-nexus.svg similarity index 100% rename from nexus/v1.0.0/catalogIcon-molgenis-nexus.svg rename to nexus/v0.1.x/catalogIcon-molgenis-nexus.svg diff --git a/nexus/v1.0.0/templates/_helpers.tpl b/nexus/v0.1.x/templates/_helpers.tpl similarity index 100% rename from nexus/v1.0.0/templates/_helpers.tpl rename to nexus/v0.1.x/templates/_helpers.tpl diff --git a/nexus/v1.0.0/templates/deployments/httpd-deployment.yaml b/nexus/v0.1.x/templates/deployments/httpd-deployment.yaml similarity index 82% rename from nexus/v1.0.0/templates/deployments/httpd-deployment.yaml rename to nexus/v0.1.x/templates/deployments/httpd-deployment.yaml index 50fc676..cbf1c0f 100644 --- a/nexus/v1.0.0/templates/deployments/httpd-deployment.yaml +++ b/nexus/v0.1.x/templates/deployments/httpd-deployment.yaml @@ -7,8 +7,9 @@ metadata: app: {{ .Values.httpd.name }} environment: {{ .Values.environment }} spec: - replicas: 1 - strategy: {} + replicas: {{ .Values.replicaCount }} + strategy: + type: {{ .Values.httpd.strategy.type }} selector: matchLabels: app: {{ .Values.httpd.selector }} @@ -25,9 +26,9 @@ spec: imagePullPolicy: {{ .Values.httpd.image.pullPolicy }} env: - name: PROXY_SERVICE - value: "{{ .Values.nexus.name }}:{{ .Values.nexus.port.ui }},{{ .Values.nexus.name }}:{{ .Values.nexus.port.docker }}:v2" + value: "{{ .Values.nexus.name }}:{{ .Values.nexus.port.ui }},{{ .Values.nexus.name }}:{{ .Values.nexus.port.docker }}:{{ .Values.nexus.path.dockerV2 }}" - name: SERVER_NAME - value: registry.molgenis.org + value: {{ .Values.httpd.hostname }} ports: - containerPort: {{ .Values.httpd.port }} resources: {} \ No newline at end of file diff --git a/nexus/v1.0.0/templates/deployments/nexus-deployment.yaml b/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml similarity index 90% rename from nexus/v1.0.0/templates/deployments/nexus-deployment.yaml rename to nexus/v0.1.x/templates/deployments/nexus-deployment.yaml index 55988cd..419dd70 100644 --- a/nexus/v1.0.0/templates/deployments/nexus-deployment.yaml +++ b/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml @@ -7,8 +7,8 @@ metadata: app: {{ .Values.nexus.name }} environment: {{ .Values.environment }} spec: - replicas: 1 - strategy: {} + replicas: {{ .Values.replicaCount }} + strategy: {{ .Values.strategy.type }} selector: matchLabels: app: {{ .Values.nexus.selector }} diff --git a/nexus/v1.0.0/templates/ingress.yaml b/nexus/v0.1.x/templates/ingress.yaml similarity index 100% rename from nexus/v1.0.0/templates/ingress.yaml rename to nexus/v0.1.x/templates/ingress.yaml diff --git a/nexus/v1.0.0/templates/services/httpd-service.yaml b/nexus/v0.1.x/templates/services/httpd-service.yaml similarity index 100% rename from nexus/v1.0.0/templates/services/httpd-service.yaml rename to nexus/v0.1.x/templates/services/httpd-service.yaml diff --git a/nexus/v1.0.0/templates/services/nexus-service.yaml b/nexus/v0.1.x/templates/services/nexus-service.yaml similarity index 100% rename from nexus/v1.0.0/templates/services/nexus-service.yaml rename to nexus/v0.1.x/templates/services/nexus-service.yaml diff --git a/nexus/v1.0.0/templates/volumes/nexus-pv.yaml b/nexus/v0.1.x/templates/volumes/nexus-pv.yaml similarity index 100% rename from nexus/v1.0.0/templates/volumes/nexus-pv.yaml rename to nexus/v0.1.x/templates/volumes/nexus-pv.yaml diff --git a/nexus/v1.0.0/templates/volumes/nexus-pvc.yaml b/nexus/v0.1.x/templates/volumes/nexus-pvc.yaml similarity index 100% rename from nexus/v1.0.0/templates/volumes/nexus-pvc.yaml rename to nexus/v0.1.x/templates/volumes/nexus-pvc.yaml diff --git a/nexus/v1.0.0/values.yaml b/nexus/v0.1.x/values.yaml similarity index 91% rename from nexus/v1.0.0/values.yaml rename to nexus/v0.1.x/values.yaml index 68d65e5..bf186f0 100644 --- a/nexus/v1.0.0/values.yaml +++ b/nexus/v0.1.x/values.yaml @@ -12,6 +12,8 @@ service: nexus: name: nexus + strategy: + type: Recreate selector: nexus restartPolicy: Always image: @@ -21,9 +23,14 @@ nexus: port: docker: 5000 ui: 8081 + path: + dockerV2: v2 httpd: name: httpd + hostname: registry.molgenis.org + strategy: + type: Recreate selector: httpd restartPolicy: Always image: @@ -32,6 +39,7 @@ httpd: pullPolicy: Always port: 80 + ingress: enabled: true annotations: {}