From b64ee00cff2885e6897588409367f129227b5647 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 14:51:27 +0200 Subject: [PATCH 01/11] refactor: Move charts to charts dir --- .../molgenis-httpd}/.helmignore | 0 .../molgenis-httpd}/Chart.yaml | 0 {molgenis-httpd => charts/molgenis-httpd}/README.md | 0 .../molgenis-httpd}/catalogIcon-molgenis-httpd.svg | 0 .../molgenis-httpd}/questions.yml | 0 .../molgenis-httpd}/templates/NOTES.txt | 0 .../molgenis-httpd}/templates/_helpers.tpl | 0 .../molgenis-httpd}/templates/deployment.yaml | 0 .../molgenis-httpd}/templates/ingress.yaml | 0 .../molgenis-httpd}/templates/service.yaml | 0 .../molgenis-httpd}/values.yaml | 0 .../molgenis-jenkins}/Chart.yaml | 0 .../molgenis-jenkins}/README.md | 0 .../catalogIcon-molgenis-jenkins.svg | 0 .../molgenis-jenkins}/charts/jenkins-0.18.0.tgz | Bin .../molgenis-jenkins}/requirements.lock | 0 .../molgenis-jenkins}/requirements.yaml | 0 .../molgenis-jenkins}/resources/README.md | 0 .../jenkins-default-tiller-user-rolebinding.yaml | 0 .../resources/tiller-user-role.yaml | 0 .../molgenis-jenkins}/templates/config.tpl | 0 .../molgenis-jenkins-dockerhub-secret.yaml | 0 .../templates/molgenis-jenkins-github-secret.yaml | 0 .../templates/molgenis-jenkins-gogs-secret.yaml | 0 .../templates/molgenis-jenkins-registry-secret.yaml | 0 .../templates/molgenis-pipeline-vault-secret.yaml | 0 .../molgenis-jenkins}/values.yaml | 0 .../molgenis-nexus}/.helmignore | 0 .../molgenis-nexus}/Chart.yaml | 0 {molgenis-nexus => charts/molgenis-nexus}/README.md | 0 .../molgenis-nexus}/catalogIcon-molgenis-nexus.svg | 0 .../molgenis-nexus}/templates/_helpers.tpl | 0 .../templates/deployments/nexus-deployment.yaml | 0 .../deployments/nexusProxy-deployment.yaml | 0 .../molgenis-nexus}/templates/ingress.yaml | 0 .../templates/persistence/nexusPVC.yaml | 0 .../templates/services/nexus-service.yaml | 0 .../templates/services/nexusProxy-service.yaml | 0 .../molgenis-nexus}/values.yaml | 0 .../molgenis-opencpu}/.helmignore | 0 .../molgenis-opencpu}/Chart.yaml | 0 .../molgenis-opencpu}/README.md | 0 .../molgenis-opencpu}/catalog-molgenis-opencpu.svg | 0 .../molgenis-opencpu}/questions.yml | 0 .../molgenis-opencpu}/templates/_helpers.tpl | 0 .../molgenis-opencpu}/templates/deployment.yaml | 0 .../molgenis-opencpu}/templates/ingress.yaml | 0 .../molgenis-opencpu}/templates/service.yaml | 0 .../molgenis-opencpu}/values.yaml | 0 .../molgenis-vault}/.helmignore | 0 .../molgenis-vault}/Chart.yaml | 0 {molgenis-vault => charts/molgenis-vault}/README.md | 0 .../molgenis-vault}/catalogIcon-molgenis-vault.svg | 0 .../molgenis-vault}/charts/etcd-operator-0.8.0.tgz | Bin .../molgenis-vault}/charts/vault-operator-0.1.1.tgz | Bin .../molgenis-vault}/requirements.lock | 0 .../molgenis-vault}/requirements.yaml | 0 .../molgenis-vault}/resources/restore.yaml | 0 .../molgenis-vault}/resources/vault.yaml | 0 .../molgenis-vault}/templates/NOTES.txt | 0 .../molgenis-vault}/templates/_helpers.tpl | 0 .../molgenis-vault}/templates/abs-secret.yaml | 0 .../molgenis-vault}/templates/backup-configmap.yaml | 0 .../molgenis-vault}/templates/backup-cronjob.yaml | 0 .../molgenis-vault}/templates/ui-ingress.yaml | 0 .../molgenis-vault}/templates/ui-service.yaml | 0 .../templates/vault-ui-deployment.yaml | 0 .../molgenis-vault}/values.yaml | 0 {molgenis => charts/molgenis}/Chart.yaml | 0 {molgenis => charts/molgenis}/README.md | 0 .../molgenis}/catalogIcon-molgenis.svg | 0 {molgenis => charts/molgenis}/questions.yml | 0 {molgenis => charts/molgenis}/templates/NOTES.txt | 0 .../molgenis}/templates/_helpers.tpl | 0 .../molgenis}/templates/deployment.yaml | 0 .../molgenis}/templates/ingress.yaml | 0 .../templates/persistence/elasticsearchPVC.yaml | 0 .../templates/persistence/molgenisPVC.yaml | 0 .../templates/persistence/postgresPVC.yaml | 0 .../molgenis}/templates/service.yaml | 0 {molgenis => charts/molgenis}/values.yaml | 0 81 files changed, 0 insertions(+), 0 deletions(-) rename {molgenis-httpd => charts/molgenis-httpd}/.helmignore (100%) rename {molgenis-httpd => charts/molgenis-httpd}/Chart.yaml (100%) rename {molgenis-httpd => charts/molgenis-httpd}/README.md (100%) rename {molgenis-httpd => charts/molgenis-httpd}/catalogIcon-molgenis-httpd.svg (100%) rename {molgenis-httpd => charts/molgenis-httpd}/questions.yml (100%) rename {molgenis-httpd => charts/molgenis-httpd}/templates/NOTES.txt (100%) rename {molgenis-httpd => charts/molgenis-httpd}/templates/_helpers.tpl (100%) rename {molgenis-httpd => charts/molgenis-httpd}/templates/deployment.yaml (100%) rename {molgenis-httpd => charts/molgenis-httpd}/templates/ingress.yaml (100%) rename {molgenis-httpd => charts/molgenis-httpd}/templates/service.yaml (100%) rename {molgenis-httpd => charts/molgenis-httpd}/values.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/Chart.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/README.md (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/catalogIcon-molgenis-jenkins.svg (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/charts/jenkins-0.18.0.tgz (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/requirements.lock (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/requirements.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/resources/README.md (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/resources/jenkins-default-tiller-user-rolebinding.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/resources/tiller-user-role.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/templates/config.tpl (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/templates/molgenis-jenkins-dockerhub-secret.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/templates/molgenis-jenkins-github-secret.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/templates/molgenis-jenkins-gogs-secret.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/templates/molgenis-jenkins-registry-secret.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/templates/molgenis-pipeline-vault-secret.yaml (100%) rename {molgenis-jenkins => charts/molgenis-jenkins}/values.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/.helmignore (100%) rename {molgenis-nexus => charts/molgenis-nexus}/Chart.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/README.md (100%) rename {molgenis-nexus => charts/molgenis-nexus}/catalogIcon-molgenis-nexus.svg (100%) rename {molgenis-nexus => charts/molgenis-nexus}/templates/_helpers.tpl (100%) rename {molgenis-nexus => charts/molgenis-nexus}/templates/deployments/nexus-deployment.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/templates/deployments/nexusProxy-deployment.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/templates/ingress.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/templates/persistence/nexusPVC.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/templates/services/nexus-service.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/templates/services/nexusProxy-service.yaml (100%) rename {molgenis-nexus => charts/molgenis-nexus}/values.yaml (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/.helmignore (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/Chart.yaml (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/README.md (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/catalog-molgenis-opencpu.svg (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/questions.yml (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/templates/_helpers.tpl (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/templates/deployment.yaml (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/templates/ingress.yaml (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/templates/service.yaml (100%) rename {molgenis-opencpu => charts/molgenis-opencpu}/values.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/.helmignore (100%) rename {molgenis-vault => charts/molgenis-vault}/Chart.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/README.md (100%) rename {molgenis-vault => charts/molgenis-vault}/catalogIcon-molgenis-vault.svg (100%) rename {molgenis-vault => charts/molgenis-vault}/charts/etcd-operator-0.8.0.tgz (100%) rename {molgenis-vault => charts/molgenis-vault}/charts/vault-operator-0.1.1.tgz (100%) rename {molgenis-vault => charts/molgenis-vault}/requirements.lock (100%) rename {molgenis-vault => charts/molgenis-vault}/requirements.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/resources/restore.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/resources/vault.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/NOTES.txt (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/_helpers.tpl (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/abs-secret.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/backup-configmap.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/backup-cronjob.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/ui-ingress.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/ui-service.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/templates/vault-ui-deployment.yaml (100%) rename {molgenis-vault => charts/molgenis-vault}/values.yaml (100%) rename {molgenis => charts/molgenis}/Chart.yaml (100%) rename {molgenis => charts/molgenis}/README.md (100%) rename {molgenis => charts/molgenis}/catalogIcon-molgenis.svg (100%) rename {molgenis => charts/molgenis}/questions.yml (100%) rename {molgenis => charts/molgenis}/templates/NOTES.txt (100%) rename {molgenis => charts/molgenis}/templates/_helpers.tpl (100%) rename {molgenis => charts/molgenis}/templates/deployment.yaml (100%) rename {molgenis => charts/molgenis}/templates/ingress.yaml (100%) rename {molgenis => charts/molgenis}/templates/persistence/elasticsearchPVC.yaml (100%) rename {molgenis => charts/molgenis}/templates/persistence/molgenisPVC.yaml (100%) rename {molgenis => charts/molgenis}/templates/persistence/postgresPVC.yaml (100%) rename {molgenis => charts/molgenis}/templates/service.yaml (100%) rename {molgenis => charts/molgenis}/values.yaml (100%) diff --git a/molgenis-httpd/.helmignore b/charts/molgenis-httpd/.helmignore similarity index 100% rename from molgenis-httpd/.helmignore rename to charts/molgenis-httpd/.helmignore diff --git a/molgenis-httpd/Chart.yaml b/charts/molgenis-httpd/Chart.yaml similarity index 100% rename from molgenis-httpd/Chart.yaml rename to charts/molgenis-httpd/Chart.yaml diff --git a/molgenis-httpd/README.md b/charts/molgenis-httpd/README.md similarity index 100% rename from molgenis-httpd/README.md rename to charts/molgenis-httpd/README.md diff --git a/molgenis-httpd/catalogIcon-molgenis-httpd.svg b/charts/molgenis-httpd/catalogIcon-molgenis-httpd.svg similarity index 100% rename from molgenis-httpd/catalogIcon-molgenis-httpd.svg rename to charts/molgenis-httpd/catalogIcon-molgenis-httpd.svg diff --git a/molgenis-httpd/questions.yml b/charts/molgenis-httpd/questions.yml similarity index 100% rename from molgenis-httpd/questions.yml rename to charts/molgenis-httpd/questions.yml diff --git a/molgenis-httpd/templates/NOTES.txt b/charts/molgenis-httpd/templates/NOTES.txt similarity index 100% rename from molgenis-httpd/templates/NOTES.txt rename to charts/molgenis-httpd/templates/NOTES.txt diff --git a/molgenis-httpd/templates/_helpers.tpl b/charts/molgenis-httpd/templates/_helpers.tpl similarity index 100% rename from molgenis-httpd/templates/_helpers.tpl rename to charts/molgenis-httpd/templates/_helpers.tpl diff --git a/molgenis-httpd/templates/deployment.yaml b/charts/molgenis-httpd/templates/deployment.yaml similarity index 100% rename from molgenis-httpd/templates/deployment.yaml rename to charts/molgenis-httpd/templates/deployment.yaml diff --git a/molgenis-httpd/templates/ingress.yaml b/charts/molgenis-httpd/templates/ingress.yaml similarity index 100% rename from molgenis-httpd/templates/ingress.yaml rename to charts/molgenis-httpd/templates/ingress.yaml diff --git a/molgenis-httpd/templates/service.yaml b/charts/molgenis-httpd/templates/service.yaml similarity index 100% rename from molgenis-httpd/templates/service.yaml rename to charts/molgenis-httpd/templates/service.yaml diff --git a/molgenis-httpd/values.yaml b/charts/molgenis-httpd/values.yaml similarity index 100% rename from molgenis-httpd/values.yaml rename to charts/molgenis-httpd/values.yaml diff --git a/molgenis-jenkins/Chart.yaml b/charts/molgenis-jenkins/Chart.yaml similarity index 100% rename from molgenis-jenkins/Chart.yaml rename to charts/molgenis-jenkins/Chart.yaml diff --git a/molgenis-jenkins/README.md b/charts/molgenis-jenkins/README.md similarity index 100% rename from molgenis-jenkins/README.md rename to charts/molgenis-jenkins/README.md diff --git a/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg b/charts/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg similarity index 100% rename from molgenis-jenkins/catalogIcon-molgenis-jenkins.svg rename to charts/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg diff --git a/molgenis-jenkins/charts/jenkins-0.18.0.tgz b/charts/molgenis-jenkins/charts/jenkins-0.18.0.tgz similarity index 100% rename from molgenis-jenkins/charts/jenkins-0.18.0.tgz rename to charts/molgenis-jenkins/charts/jenkins-0.18.0.tgz diff --git a/molgenis-jenkins/requirements.lock b/charts/molgenis-jenkins/requirements.lock similarity index 100% rename from molgenis-jenkins/requirements.lock rename to charts/molgenis-jenkins/requirements.lock diff --git a/molgenis-jenkins/requirements.yaml b/charts/molgenis-jenkins/requirements.yaml similarity index 100% rename from molgenis-jenkins/requirements.yaml rename to charts/molgenis-jenkins/requirements.yaml diff --git a/molgenis-jenkins/resources/README.md b/charts/molgenis-jenkins/resources/README.md similarity index 100% rename from molgenis-jenkins/resources/README.md rename to charts/molgenis-jenkins/resources/README.md diff --git a/molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml b/charts/molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml similarity index 100% rename from molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml rename to charts/molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml diff --git a/molgenis-jenkins/resources/tiller-user-role.yaml b/charts/molgenis-jenkins/resources/tiller-user-role.yaml similarity index 100% rename from molgenis-jenkins/resources/tiller-user-role.yaml rename to charts/molgenis-jenkins/resources/tiller-user-role.yaml diff --git a/molgenis-jenkins/templates/config.tpl b/charts/molgenis-jenkins/templates/config.tpl similarity index 100% rename from molgenis-jenkins/templates/config.tpl rename to charts/molgenis-jenkins/templates/config.tpl diff --git a/molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml similarity index 100% rename from molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml rename to charts/molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml diff --git a/molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml similarity index 100% rename from molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml rename to charts/molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml diff --git a/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml similarity index 100% rename from molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml rename to charts/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml diff --git a/molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml similarity index 100% rename from molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml rename to charts/molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml diff --git a/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml similarity index 100% rename from molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml rename to charts/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml diff --git a/molgenis-jenkins/values.yaml b/charts/molgenis-jenkins/values.yaml similarity index 100% rename from molgenis-jenkins/values.yaml rename to charts/molgenis-jenkins/values.yaml diff --git a/molgenis-nexus/.helmignore b/charts/molgenis-nexus/.helmignore similarity index 100% rename from molgenis-nexus/.helmignore rename to charts/molgenis-nexus/.helmignore diff --git a/molgenis-nexus/Chart.yaml b/charts/molgenis-nexus/Chart.yaml similarity index 100% rename from molgenis-nexus/Chart.yaml rename to charts/molgenis-nexus/Chart.yaml diff --git a/molgenis-nexus/README.md b/charts/molgenis-nexus/README.md similarity index 100% rename from molgenis-nexus/README.md rename to charts/molgenis-nexus/README.md diff --git a/molgenis-nexus/catalogIcon-molgenis-nexus.svg b/charts/molgenis-nexus/catalogIcon-molgenis-nexus.svg similarity index 100% rename from molgenis-nexus/catalogIcon-molgenis-nexus.svg rename to charts/molgenis-nexus/catalogIcon-molgenis-nexus.svg diff --git a/molgenis-nexus/templates/_helpers.tpl b/charts/molgenis-nexus/templates/_helpers.tpl similarity index 100% rename from molgenis-nexus/templates/_helpers.tpl rename to charts/molgenis-nexus/templates/_helpers.tpl diff --git a/molgenis-nexus/templates/deployments/nexus-deployment.yaml b/charts/molgenis-nexus/templates/deployments/nexus-deployment.yaml similarity index 100% rename from molgenis-nexus/templates/deployments/nexus-deployment.yaml rename to charts/molgenis-nexus/templates/deployments/nexus-deployment.yaml diff --git a/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml b/charts/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml similarity index 100% rename from molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml rename to charts/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml diff --git a/molgenis-nexus/templates/ingress.yaml b/charts/molgenis-nexus/templates/ingress.yaml similarity index 100% rename from molgenis-nexus/templates/ingress.yaml rename to charts/molgenis-nexus/templates/ingress.yaml diff --git a/molgenis-nexus/templates/persistence/nexusPVC.yaml b/charts/molgenis-nexus/templates/persistence/nexusPVC.yaml similarity index 100% rename from molgenis-nexus/templates/persistence/nexusPVC.yaml rename to charts/molgenis-nexus/templates/persistence/nexusPVC.yaml diff --git a/molgenis-nexus/templates/services/nexus-service.yaml b/charts/molgenis-nexus/templates/services/nexus-service.yaml similarity index 100% rename from molgenis-nexus/templates/services/nexus-service.yaml rename to charts/molgenis-nexus/templates/services/nexus-service.yaml diff --git a/molgenis-nexus/templates/services/nexusProxy-service.yaml b/charts/molgenis-nexus/templates/services/nexusProxy-service.yaml similarity index 100% rename from molgenis-nexus/templates/services/nexusProxy-service.yaml rename to charts/molgenis-nexus/templates/services/nexusProxy-service.yaml diff --git a/molgenis-nexus/values.yaml b/charts/molgenis-nexus/values.yaml similarity index 100% rename from molgenis-nexus/values.yaml rename to charts/molgenis-nexus/values.yaml diff --git a/molgenis-opencpu/.helmignore b/charts/molgenis-opencpu/.helmignore similarity index 100% rename from molgenis-opencpu/.helmignore rename to charts/molgenis-opencpu/.helmignore diff --git a/molgenis-opencpu/Chart.yaml b/charts/molgenis-opencpu/Chart.yaml similarity index 100% rename from molgenis-opencpu/Chart.yaml rename to charts/molgenis-opencpu/Chart.yaml diff --git a/molgenis-opencpu/README.md b/charts/molgenis-opencpu/README.md similarity index 100% rename from molgenis-opencpu/README.md rename to charts/molgenis-opencpu/README.md diff --git a/molgenis-opencpu/catalog-molgenis-opencpu.svg b/charts/molgenis-opencpu/catalog-molgenis-opencpu.svg similarity index 100% rename from molgenis-opencpu/catalog-molgenis-opencpu.svg rename to charts/molgenis-opencpu/catalog-molgenis-opencpu.svg diff --git a/molgenis-opencpu/questions.yml b/charts/molgenis-opencpu/questions.yml similarity index 100% rename from molgenis-opencpu/questions.yml rename to charts/molgenis-opencpu/questions.yml diff --git a/molgenis-opencpu/templates/_helpers.tpl b/charts/molgenis-opencpu/templates/_helpers.tpl similarity index 100% rename from molgenis-opencpu/templates/_helpers.tpl rename to charts/molgenis-opencpu/templates/_helpers.tpl diff --git a/molgenis-opencpu/templates/deployment.yaml b/charts/molgenis-opencpu/templates/deployment.yaml similarity index 100% rename from molgenis-opencpu/templates/deployment.yaml rename to charts/molgenis-opencpu/templates/deployment.yaml diff --git a/molgenis-opencpu/templates/ingress.yaml b/charts/molgenis-opencpu/templates/ingress.yaml similarity index 100% rename from molgenis-opencpu/templates/ingress.yaml rename to charts/molgenis-opencpu/templates/ingress.yaml diff --git a/molgenis-opencpu/templates/service.yaml b/charts/molgenis-opencpu/templates/service.yaml similarity index 100% rename from molgenis-opencpu/templates/service.yaml rename to charts/molgenis-opencpu/templates/service.yaml diff --git a/molgenis-opencpu/values.yaml b/charts/molgenis-opencpu/values.yaml similarity index 100% rename from molgenis-opencpu/values.yaml rename to charts/molgenis-opencpu/values.yaml diff --git a/molgenis-vault/.helmignore b/charts/molgenis-vault/.helmignore similarity index 100% rename from molgenis-vault/.helmignore rename to charts/molgenis-vault/.helmignore diff --git a/molgenis-vault/Chart.yaml b/charts/molgenis-vault/Chart.yaml similarity index 100% rename from molgenis-vault/Chart.yaml rename to charts/molgenis-vault/Chart.yaml diff --git a/molgenis-vault/README.md b/charts/molgenis-vault/README.md similarity index 100% rename from molgenis-vault/README.md rename to charts/molgenis-vault/README.md diff --git a/molgenis-vault/catalogIcon-molgenis-vault.svg b/charts/molgenis-vault/catalogIcon-molgenis-vault.svg similarity index 100% rename from molgenis-vault/catalogIcon-molgenis-vault.svg rename to charts/molgenis-vault/catalogIcon-molgenis-vault.svg diff --git a/molgenis-vault/charts/etcd-operator-0.8.0.tgz b/charts/molgenis-vault/charts/etcd-operator-0.8.0.tgz similarity index 100% rename from molgenis-vault/charts/etcd-operator-0.8.0.tgz rename to charts/molgenis-vault/charts/etcd-operator-0.8.0.tgz diff --git a/molgenis-vault/charts/vault-operator-0.1.1.tgz b/charts/molgenis-vault/charts/vault-operator-0.1.1.tgz similarity index 100% rename from molgenis-vault/charts/vault-operator-0.1.1.tgz rename to charts/molgenis-vault/charts/vault-operator-0.1.1.tgz diff --git a/molgenis-vault/requirements.lock b/charts/molgenis-vault/requirements.lock similarity index 100% rename from molgenis-vault/requirements.lock rename to charts/molgenis-vault/requirements.lock diff --git a/molgenis-vault/requirements.yaml b/charts/molgenis-vault/requirements.yaml similarity index 100% rename from molgenis-vault/requirements.yaml rename to charts/molgenis-vault/requirements.yaml diff --git a/molgenis-vault/resources/restore.yaml b/charts/molgenis-vault/resources/restore.yaml similarity index 100% rename from molgenis-vault/resources/restore.yaml rename to charts/molgenis-vault/resources/restore.yaml diff --git a/molgenis-vault/resources/vault.yaml b/charts/molgenis-vault/resources/vault.yaml similarity index 100% rename from molgenis-vault/resources/vault.yaml rename to charts/molgenis-vault/resources/vault.yaml diff --git a/molgenis-vault/templates/NOTES.txt b/charts/molgenis-vault/templates/NOTES.txt similarity index 100% rename from molgenis-vault/templates/NOTES.txt rename to charts/molgenis-vault/templates/NOTES.txt diff --git a/molgenis-vault/templates/_helpers.tpl b/charts/molgenis-vault/templates/_helpers.tpl similarity index 100% rename from molgenis-vault/templates/_helpers.tpl rename to charts/molgenis-vault/templates/_helpers.tpl diff --git a/molgenis-vault/templates/abs-secret.yaml b/charts/molgenis-vault/templates/abs-secret.yaml similarity index 100% rename from molgenis-vault/templates/abs-secret.yaml rename to charts/molgenis-vault/templates/abs-secret.yaml diff --git a/molgenis-vault/templates/backup-configmap.yaml b/charts/molgenis-vault/templates/backup-configmap.yaml similarity index 100% rename from molgenis-vault/templates/backup-configmap.yaml rename to charts/molgenis-vault/templates/backup-configmap.yaml diff --git a/molgenis-vault/templates/backup-cronjob.yaml b/charts/molgenis-vault/templates/backup-cronjob.yaml similarity index 100% rename from molgenis-vault/templates/backup-cronjob.yaml rename to charts/molgenis-vault/templates/backup-cronjob.yaml diff --git a/molgenis-vault/templates/ui-ingress.yaml b/charts/molgenis-vault/templates/ui-ingress.yaml similarity index 100% rename from molgenis-vault/templates/ui-ingress.yaml rename to charts/molgenis-vault/templates/ui-ingress.yaml diff --git a/molgenis-vault/templates/ui-service.yaml b/charts/molgenis-vault/templates/ui-service.yaml similarity index 100% rename from molgenis-vault/templates/ui-service.yaml rename to charts/molgenis-vault/templates/ui-service.yaml diff --git a/molgenis-vault/templates/vault-ui-deployment.yaml b/charts/molgenis-vault/templates/vault-ui-deployment.yaml similarity index 100% rename from molgenis-vault/templates/vault-ui-deployment.yaml rename to charts/molgenis-vault/templates/vault-ui-deployment.yaml diff --git a/molgenis-vault/values.yaml b/charts/molgenis-vault/values.yaml similarity index 100% rename from molgenis-vault/values.yaml rename to charts/molgenis-vault/values.yaml diff --git a/molgenis/Chart.yaml b/charts/molgenis/Chart.yaml similarity index 100% rename from molgenis/Chart.yaml rename to charts/molgenis/Chart.yaml diff --git a/molgenis/README.md b/charts/molgenis/README.md similarity index 100% rename from molgenis/README.md rename to charts/molgenis/README.md diff --git a/molgenis/catalogIcon-molgenis.svg b/charts/molgenis/catalogIcon-molgenis.svg similarity index 100% rename from molgenis/catalogIcon-molgenis.svg rename to charts/molgenis/catalogIcon-molgenis.svg diff --git a/molgenis/questions.yml b/charts/molgenis/questions.yml similarity index 100% rename from molgenis/questions.yml rename to charts/molgenis/questions.yml diff --git a/molgenis/templates/NOTES.txt b/charts/molgenis/templates/NOTES.txt similarity index 100% rename from molgenis/templates/NOTES.txt rename to charts/molgenis/templates/NOTES.txt diff --git a/molgenis/templates/_helpers.tpl b/charts/molgenis/templates/_helpers.tpl similarity index 100% rename from molgenis/templates/_helpers.tpl rename to charts/molgenis/templates/_helpers.tpl diff --git a/molgenis/templates/deployment.yaml b/charts/molgenis/templates/deployment.yaml similarity index 100% rename from molgenis/templates/deployment.yaml rename to charts/molgenis/templates/deployment.yaml diff --git a/molgenis/templates/ingress.yaml b/charts/molgenis/templates/ingress.yaml similarity index 100% rename from molgenis/templates/ingress.yaml rename to charts/molgenis/templates/ingress.yaml diff --git a/molgenis/templates/persistence/elasticsearchPVC.yaml b/charts/molgenis/templates/persistence/elasticsearchPVC.yaml similarity index 100% rename from molgenis/templates/persistence/elasticsearchPVC.yaml rename to charts/molgenis/templates/persistence/elasticsearchPVC.yaml diff --git a/molgenis/templates/persistence/molgenisPVC.yaml b/charts/molgenis/templates/persistence/molgenisPVC.yaml similarity index 100% rename from molgenis/templates/persistence/molgenisPVC.yaml rename to charts/molgenis/templates/persistence/molgenisPVC.yaml diff --git a/molgenis/templates/persistence/postgresPVC.yaml b/charts/molgenis/templates/persistence/postgresPVC.yaml similarity index 100% rename from molgenis/templates/persistence/postgresPVC.yaml rename to charts/molgenis/templates/persistence/postgresPVC.yaml diff --git a/molgenis/templates/service.yaml b/charts/molgenis/templates/service.yaml similarity index 100% rename from molgenis/templates/service.yaml rename to charts/molgenis/templates/service.yaml diff --git a/molgenis/values.yaml b/charts/molgenis/values.yaml similarity index 100% rename from molgenis/values.yaml rename to charts/molgenis/values.yaml From 26d366f1a1c3fa0663b4ce76571dc3939adde102 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 14:52:11 +0200 Subject: [PATCH 02/11] chore: Add Jenkinsfile --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..85f139e --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,16 @@ +pipeline { + agent { + kubernetes { + label 'helm' + } + } + stages { + stage('Test') { + steps { + container('chart-testing') { + sh "chart_test.sh --no-install --all" + } + } + } + } +} \ No newline at end of file From 28bf98e6b289835109ba573fd2c35b477b33b87f Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Fri, 28 Sep 2018 17:49:40 +0200 Subject: [PATCH 03/11] fix (molgenis-opencpu): Add home and maintainers and fix whitespace --- charts/molgenis-opencpu/Chart.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/molgenis-opencpu/Chart.yaml b/charts/molgenis-opencpu/Chart.yaml index 0ffe477..ba1d1e7 100644 --- a/charts/molgenis-opencpu/Chart.yaml +++ b/charts/molgenis-opencpu/Chart.yaml @@ -5,4 +5,8 @@ name: molgenis-opencpu version: 0.1.1 sources: - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git -icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-opencpu/catalogIcon-molgenis-opencpu.svg \ No newline at end of file +icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-opencpu/catalogIcon-molgenis-opencpu.svg +home: https://www.opencpu.org +maintainers: +- name: sidohaakma +- name: fdlk From b58a1d2042384b223b2289a09ccaa1cce568e314 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Fri, 28 Sep 2018 17:57:47 +0200 Subject: [PATCH 04/11] fix (molgenis-jenkins): Fix chart --- charts/molgenis-jenkins/Chart.yaml | 3 +++ charts/molgenis-jenkins/values.yaml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/molgenis-jenkins/Chart.yaml b/charts/molgenis-jenkins/Chart.yaml index a50005e..13c6329 100755 --- a/charts/molgenis-jenkins/Chart.yaml +++ b/charts/molgenis-jenkins/Chart.yaml @@ -6,3 +6,6 @@ description: Molgenis installation for the jenkins chart. sources: - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg +maintainers: +- name: fdlk +- name: sidohaakma diff --git a/charts/molgenis-jenkins/values.yaml b/charts/molgenis-jenkins/values.yaml index 190ae98..3b57e2a 100644 --- a/charts/molgenis-jenkins/values.yaml +++ b/charts/molgenis-jenkins/values.yaml @@ -584,7 +584,7 @@ jenkins: memory: "512Mi" NodeSelector: {} -#secret contains configuration for the kubernetes secrets that jenkins can access +# secret contains configuration for the kubernetes secrets that jenkins can access secret: # vault configures the vault secret vault: @@ -606,4 +606,4 @@ secret: # dockerHubPassword contains password for hub.docker.com dockerHub: user: molgenisci - password: xxxx \ No newline at end of file + password: xxxx From 86d6dfb86bce2d06bfa3a851c2c234d6288057e0 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 11:47:43 +0200 Subject: [PATCH 05/11] fix (molgenis-httpd): Add maintainers and home and newlines --- charts/molgenis-httpd/Chart.yaml | 6 +++++- charts/molgenis-httpd/values.yaml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/molgenis-httpd/Chart.yaml b/charts/molgenis-httpd/Chart.yaml index 4fe30f7..505dd03 100644 --- a/charts/molgenis-httpd/Chart.yaml +++ b/charts/molgenis-httpd/Chart.yaml @@ -5,4 +5,8 @@ name: molgenis-httpd version: 0.1.0 sources: - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git -icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-httpd/catalogIcon-molgenis-httpd.svg \ No newline at end of file +icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-httpd/catalogIcon-molgenis-httpd.svg +home: http://httpd.apache.org +maintainers: +- name: sidohaakma +- name: fdlk diff --git a/charts/molgenis-httpd/values.yaml b/charts/molgenis-httpd/values.yaml index 04fffb6..b4246ba 100644 --- a/charts/molgenis-httpd/values.yaml +++ b/charts/molgenis-httpd/values.yaml @@ -48,4 +48,4 @@ nodeSelector: {} tolerations: [] -affinity: {} \ No newline at end of file +affinity: {} From 55ad5b26fb6be9f189add8b4dfaeb215645471a7 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 13:57:57 +0200 Subject: [PATCH 06/11] fix (molgenis): Add maintainers and home and fix indentation --- charts/molgenis/Chart.yaml | 6 +++++- charts/molgenis/values.yaml | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/charts/molgenis/Chart.yaml b/charts/molgenis/Chart.yaml index cde7e05..3999c48 100644 --- a/charts/molgenis/Chart.yaml +++ b/charts/molgenis/Chart.yaml @@ -5,4 +5,8 @@ name: molgenis version: 0.4.3 sources: - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git -icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis/catalogIcon-molgenis.svg \ No newline at end of file +icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis/catalogIcon-molgenis.svg +home: http://molgenis.org +maintainers: +- name: sidohaakma +- name: fdlk diff --git a/charts/molgenis/values.yaml b/charts/molgenis/values.yaml index c9fa30c..e9ddb99 100644 --- a/charts/molgenis/values.yaml +++ b/charts/molgenis/values.yaml @@ -64,12 +64,12 @@ elasticsearch: javaOpts: "-Xms1g -Xmx1g" clusterName: molgenis resources: - limits: - cpu: 2 - memory: 3Gi - requests: - cpu: 100m - memory: 1Gi + limits: + cpu: 2 + memory: 3Gi + requests: + cpu: 100m + memory: 1Gi persistence: claim: elasticsearch-nfs-claim size: 5Gi From 367c63eaa5e3b7f73a5ecb1f54f67d44e1ce59f3 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 14:02:57 +0200 Subject: [PATCH 07/11] fix (molgenis-nexus): Add maintainers and home and fix newline --- charts/molgenis-nexus/Chart.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/molgenis-nexus/Chart.yaml b/charts/molgenis-nexus/Chart.yaml index 0ced74d..e27e077 100644 --- a/charts/molgenis-nexus/Chart.yaml +++ b/charts/molgenis-nexus/Chart.yaml @@ -5,4 +5,8 @@ name: molgenis-nexus version: 0.4.2 sources: - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git -icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-nexus/catalogIcon-molgenis-nexus.svg \ No newline at end of file +icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-nexus/catalogIcon-molgenis-nexus.svg +home: https://www.sonatype.com/nexus-repository-oss +maintainers: +- name: sidohaakma +- name: fdlk From f43b21bcc6f5b0b2591c8c457bee87c86ced9de9 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 14:08:10 +0200 Subject: [PATCH 08/11] fix (molgenis-vault): Add maintainers and home and fix whitespace --- charts/molgenis-vault/Chart.yaml | 4 ++++ charts/molgenis-vault/values.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/molgenis-vault/Chart.yaml b/charts/molgenis-vault/Chart.yaml index f6b75e4..8ab4f68 100644 --- a/charts/molgenis-vault/Chart.yaml +++ b/charts/molgenis-vault/Chart.yaml @@ -4,3 +4,7 @@ description: MOLGENIS vault name: molgenis-vault version: 0.1.1 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-vault/catalogIcon-molgenis-vault.svg +home: https://github.com/coreos/vault-operator +maintainers: +- name: fdlk +- name: sidohaakma diff --git a/charts/molgenis-vault/values.yaml b/charts/molgenis-vault/values.yaml index aaca8f3..2dd48f5 100644 --- a/charts/molgenis-vault/values.yaml +++ b/charts/molgenis-vault/values.yaml @@ -70,10 +70,10 @@ ui: # limits: # cpu: 100m # memory: 128Mi - #requests: + # requests: # cpu: 100m # memory: 128Mi nodeSelector: {} vault: auth: GITHUB - url: https://vault.vault-operator:8200 \ No newline at end of file + url: https://vault.vault-operator:8200 From 71a0889ad8a04f959dc923a8148d14af4abb8900 Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 14:53:32 +0200 Subject: [PATCH 09/11] feat (molgenis-jenkins): Add helm build pod. --- charts/molgenis-jenkins/Chart.yaml | 4 ++-- charts/molgenis-jenkins/values.yaml | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/charts/molgenis-jenkins/Chart.yaml b/charts/molgenis-jenkins/Chart.yaml index 13c6329..c77c7b4 100755 --- a/charts/molgenis-jenkins/Chart.yaml +++ b/charts/molgenis-jenkins/Chart.yaml @@ -1,7 +1,7 @@ name: molgenis-jenkins home: https://jenkins.io/ -version: 0.8.0 -appVersion: 2.121 +version: 0.8.1 +appVersion: 2.138.1 description: Molgenis installation for the jenkins chart. sources: - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git diff --git a/charts/molgenis-jenkins/values.yaml b/charts/molgenis-jenkins/values.yaml index 3b57e2a..1d61a89 100644 --- a/charts/molgenis-jenkins/values.yaml +++ b/charts/molgenis-jenkins/values.yaml @@ -583,6 +583,17 @@ jenkins: cpu: "1" memory: "512Mi" NodeSelector: {} + helm: + Label: helm + NodeUsageMode: EXCLUSIVE + Containers: + chart-testing: + Image: "quay.io/helmpack/chart-testing" + ImageTag: v1.1.0 + Command: cat + WorkingDir: /home/jenkins + TTY: true + NodeSelector: {} # secret contains configuration for the kubernetes secrets that jenkins can access secret: From f44043786262988b08bc7e87df0d52bc2da34dbb Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 18:54:21 +0200 Subject: [PATCH 10/11] chore (Jenkinsfile): package and deploy --- .gitignore | 3 ++- Jenkinsfile | 21 +++++++++++++++++++++ charts/molgenis-jenkins/values.yaml | 23 +++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 29b636a..e5aa5b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -*.iml \ No newline at end of file +*.iml +target \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 85f139e..c308d16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,5 +12,26 @@ pipeline { } } } + stage('Package') { + steps { + container('chart-testing'){ + sh 'mkdir target' + sh 'for dir in charts/*; do helm package --destination target "$dir"; done' + } + } + } + stage('Deploy') { + steps { + container('vault') { + script { + env.NEXUS_USER = sh(script: 'vault read -field=username secret/ops/account/nexus', returnStdout: true) + env.NEXUS_PWD = sh(script: 'vault read -field=password secret/ops/account/nexus', returnStdout: true) + } + } + container('alpine') { + sh 'set +x; for chart in target/*; do curl -L -u $NEXUS_USER:$NEXUS_PWD http://registry.molgenis.org/repository/helm/ --upload-file "$chart"; done' + } + } + } } } \ No newline at end of file diff --git a/charts/molgenis-jenkins/values.yaml b/charts/molgenis-jenkins/values.yaml index 1d61a89..583b472 100644 --- a/charts/molgenis-jenkins/values.yaml +++ b/charts/molgenis-jenkins/values.yaml @@ -593,6 +593,29 @@ jenkins: Command: cat WorkingDir: /home/jenkins TTY: true + alpine: + Image: "spotify/alpine" + Command: cat + WorkingDir: /home/jenkins + TTY: true + vault: + Image: "vault" + Command: cat + WorkingDir: /home/jenkins + TTY: true + EnvVars: + - type: Secret + key: VAULT_TOKEN + secretName: molgenis-pipeline-vault-secret + secretKey: token + - type: Secret + key: VAULT_SKIP_VERIFY + secretName: molgenis-pipeline-vault-secret + secretKey: skipVerify + - type: Secret + key: VAULT_ADDR + secretName: molgenis-pipeline-vault-secret + secretKey: addr NodeSelector: {} # secret contains configuration for the kubernetes secrets that jenkins can access From d4f2dadb06fd132b719617edccb298761dccedce Mon Sep 17 00:00:00 2001 From: Fleur Kelpin Date: Sat, 29 Sep 2018 19:38:49 +0200 Subject: [PATCH 11/11] chore (Jenkinsfile): Only deploy if branch is master --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c308d16..6f00949 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,6 +21,9 @@ pipeline { } } stage('Deploy') { + when { + branch 'master' + } steps { container('vault') { script {