From 01484853b978095f60f908152843ac523f07f251 Mon Sep 17 00:00:00 2001 From: sido Date: Thu, 24 May 2018 06:22:37 +0200 Subject: [PATCH] fix(structure): updated directory structure to chart format --- jenkins/{v1.0.0 => }/.helmignore | 0 jenkins/{v1.0.0 => }/Chart.yaml | 0 jenkins/{v1.0.0 => }/catalogIcon-molgenis-jenkins.svg | 0 jenkins/{v1.0.0 => }/templates/NOTES.txt | 0 jenkins/{v1.0.0 => }/templates/_helpers.tpl | 0 jenkins/{v1.0.0 => }/templates/deployment.yaml | 0 jenkins/{v1.0.0 => }/templates/ingress.yaml | 0 jenkins/{v1.0.0 => }/templates/service.yaml | 0 jenkins/{v1.0.0 => }/values.yaml | 4 ++-- nexus/{v1.0.0 => }/.helmignore | 0 nexus/{v1.0.0 => }/Chart.yaml | 0 nexus/{v1.0.0 => }/catalogIcon-molgenis-nexus.svg | 0 nexus/{v1.0.0 => }/templates/NOTES.txt | 0 nexus/{v1.0.0 => }/templates/_helpers.tpl | 0 nexus/{v1.0.0 => }/templates/deployment.yaml | 0 nexus/{v1.0.0 => }/templates/ingress.yaml | 0 nexus/{v1.0.0 => }/templates/service.yaml | 0 nexus/{v1.0.0 => }/values.yaml | 8 +++++++- 18 files changed, 9 insertions(+), 3 deletions(-) rename jenkins/{v1.0.0 => }/.helmignore (100%) rename jenkins/{v1.0.0 => }/Chart.yaml (100%) rename jenkins/{v1.0.0 => }/catalogIcon-molgenis-jenkins.svg (100%) rename jenkins/{v1.0.0 => }/templates/NOTES.txt (100%) rename jenkins/{v1.0.0 => }/templates/_helpers.tpl (100%) rename jenkins/{v1.0.0 => }/templates/deployment.yaml (100%) rename jenkins/{v1.0.0 => }/templates/ingress.yaml (100%) rename jenkins/{v1.0.0 => }/templates/service.yaml (100%) rename jenkins/{v1.0.0 => }/values.yaml (91%) rename nexus/{v1.0.0 => }/.helmignore (100%) rename nexus/{v1.0.0 => }/Chart.yaml (100%) rename nexus/{v1.0.0 => }/catalogIcon-molgenis-nexus.svg (100%) rename nexus/{v1.0.0 => }/templates/NOTES.txt (100%) rename nexus/{v1.0.0 => }/templates/_helpers.tpl (100%) rename nexus/{v1.0.0 => }/templates/deployment.yaml (100%) rename nexus/{v1.0.0 => }/templates/ingress.yaml (100%) rename nexus/{v1.0.0 => }/templates/service.yaml (100%) rename nexus/{v1.0.0 => }/values.yaml (86%) diff --git a/jenkins/v1.0.0/.helmignore b/jenkins/.helmignore similarity index 100% rename from jenkins/v1.0.0/.helmignore rename to jenkins/.helmignore diff --git a/jenkins/v1.0.0/Chart.yaml b/jenkins/Chart.yaml similarity index 100% rename from jenkins/v1.0.0/Chart.yaml rename to jenkins/Chart.yaml diff --git a/jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg b/jenkins/catalogIcon-molgenis-jenkins.svg similarity index 100% rename from jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg rename to jenkins/catalogIcon-molgenis-jenkins.svg diff --git a/jenkins/v1.0.0/templates/NOTES.txt b/jenkins/templates/NOTES.txt similarity index 100% rename from jenkins/v1.0.0/templates/NOTES.txt rename to jenkins/templates/NOTES.txt diff --git a/jenkins/v1.0.0/templates/_helpers.tpl b/jenkins/templates/_helpers.tpl similarity index 100% rename from jenkins/v1.0.0/templates/_helpers.tpl rename to jenkins/templates/_helpers.tpl diff --git a/jenkins/v1.0.0/templates/deployment.yaml b/jenkins/templates/deployment.yaml similarity index 100% rename from jenkins/v1.0.0/templates/deployment.yaml rename to jenkins/templates/deployment.yaml diff --git a/jenkins/v1.0.0/templates/ingress.yaml b/jenkins/templates/ingress.yaml similarity index 100% rename from jenkins/v1.0.0/templates/ingress.yaml rename to jenkins/templates/ingress.yaml diff --git a/jenkins/v1.0.0/templates/service.yaml b/jenkins/templates/service.yaml similarity index 100% rename from jenkins/v1.0.0/templates/service.yaml rename to jenkins/templates/service.yaml diff --git a/jenkins/v1.0.0/values.yaml b/jenkins/values.yaml similarity index 91% rename from jenkins/v1.0.0/values.yaml rename to jenkins/values.yaml index e1a4429..f1568aa 100644 --- a/jenkins/v1.0.0/values.yaml +++ b/jenkins/values.yaml @@ -5,13 +5,13 @@ replicaCount: 1 image: - repository: nginx + repository: registry.molgenis.org/molgenis-ops-releases/jenkins-master:lts tag: stable pullPolicy: IfNotPresent service: type: ClusterIP - port: 80 + port: 8080 ingress: enabled: false diff --git a/nexus/v1.0.0/.helmignore b/nexus/.helmignore similarity index 100% rename from nexus/v1.0.0/.helmignore rename to nexus/.helmignore diff --git a/nexus/v1.0.0/Chart.yaml b/nexus/Chart.yaml similarity index 100% rename from nexus/v1.0.0/Chart.yaml rename to nexus/Chart.yaml diff --git a/nexus/v1.0.0/catalogIcon-molgenis-nexus.svg b/nexus/catalogIcon-molgenis-nexus.svg similarity index 100% rename from nexus/v1.0.0/catalogIcon-molgenis-nexus.svg rename to nexus/catalogIcon-molgenis-nexus.svg diff --git a/nexus/v1.0.0/templates/NOTES.txt b/nexus/templates/NOTES.txt similarity index 100% rename from nexus/v1.0.0/templates/NOTES.txt rename to nexus/templates/NOTES.txt diff --git a/nexus/v1.0.0/templates/_helpers.tpl b/nexus/templates/_helpers.tpl similarity index 100% rename from nexus/v1.0.0/templates/_helpers.tpl rename to nexus/templates/_helpers.tpl diff --git a/nexus/v1.0.0/templates/deployment.yaml b/nexus/templates/deployment.yaml similarity index 100% rename from nexus/v1.0.0/templates/deployment.yaml rename to nexus/templates/deployment.yaml diff --git a/nexus/v1.0.0/templates/ingress.yaml b/nexus/templates/ingress.yaml similarity index 100% rename from nexus/v1.0.0/templates/ingress.yaml rename to nexus/templates/ingress.yaml diff --git a/nexus/v1.0.0/templates/service.yaml b/nexus/templates/service.yaml similarity index 100% rename from nexus/v1.0.0/templates/service.yaml rename to nexus/templates/service.yaml diff --git a/nexus/v1.0.0/values.yaml b/nexus/values.yaml similarity index 86% rename from nexus/v1.0.0/values.yaml rename to nexus/values.yaml index 90c8315..3f139ac 100644 --- a/nexus/v1.0.0/values.yaml +++ b/nexus/values.yaml @@ -11,7 +11,13 @@ image: service: type: ClusterIP - port: 8080 + ports: + - port: 8080 + protocol: TCP + name: {{ .Values.service.name }} + - port: 5000 + protocol: TCP + name: {{ .Values.service.name }} ingress: enabled: false