From 09c762c1b319860ff05d77175744ce628efadf2d Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 17:18:25 +0200 Subject: [PATCH 1/9] volumes permissions --- nexus/v0.1.x/templates/deployments/nexus-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml b/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml index c6b9866..b574e07 100644 --- a/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml +++ b/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml @@ -30,7 +30,7 @@ spec: command: ["sh", "-c", "chown -R 200:200 /gcc/molgenis/nexus"] volumeMounts: - name: molgenis-nexus-data - mountPath: "/nexus-data" + mountPath: "/gcc/molgenis/nexus" containers: - name: {{ .Values.nexus.name }} image: "{{ .Values.nexus.image.repository }}:{{ .Values.nexus.image.tag }}" From ccc3be8a9d78357dbf355cf85e1141f2e8e86915 Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 18:02:30 +0200 Subject: [PATCH 2/9] volumes: make volumes abstract --- {nexus => molgenis-nexus}/v0.1.x/.helmignore | 0 {nexus => molgenis-nexus}/v0.1.x/Chart.yaml | 0 .../v0.1.x/catalogIcon-molgenis-nexus.svg | 0 .../v0.1.x/templates/_helpers.tpl | 0 .../templates/deployments/httpd-deployment.yaml | 0 .../templates/deployments/nexus-deployment.yaml | 12 ++++++------ .../v0.1.x/templates/ingress.yaml | 0 .../v0.1.x/templates/services/httpd-service.yaml | 0 .../v0.1.x/templates/services/nexus-service.yaml | 0 .../v0.1.x/templates/volumes/nexus-pv.yaml | 16 ++++++++++++++++ .../v0.1.x/templates/volumes/nexus-pvc.yaml | 6 +++--- {nexus => molgenis-nexus}/v0.1.x/values.yaml | 9 +++++++++ nexus/v0.1.x/templates/volumes/nexus-pv.yaml | 16 ---------------- 13 files changed, 34 insertions(+), 25 deletions(-) rename {nexus => molgenis-nexus}/v0.1.x/.helmignore (100%) rename {nexus => molgenis-nexus}/v0.1.x/Chart.yaml (100%) rename {nexus => molgenis-nexus}/v0.1.x/catalogIcon-molgenis-nexus.svg (100%) rename {nexus => molgenis-nexus}/v0.1.x/templates/_helpers.tpl (100%) rename {nexus => molgenis-nexus}/v0.1.x/templates/deployments/httpd-deployment.yaml (100%) rename {nexus => molgenis-nexus}/v0.1.x/templates/deployments/nexus-deployment.yaml (76%) rename {nexus => molgenis-nexus}/v0.1.x/templates/ingress.yaml (100%) rename {nexus => molgenis-nexus}/v0.1.x/templates/services/httpd-service.yaml (100%) rename {nexus => molgenis-nexus}/v0.1.x/templates/services/nexus-service.yaml (100%) create mode 100644 molgenis-nexus/v0.1.x/templates/volumes/nexus-pv.yaml rename {nexus => molgenis-nexus}/v0.1.x/templates/volumes/nexus-pvc.yaml (50%) rename {nexus => molgenis-nexus}/v0.1.x/values.yaml (89%) delete mode 100644 nexus/v0.1.x/templates/volumes/nexus-pv.yaml diff --git a/nexus/v0.1.x/.helmignore b/molgenis-nexus/v0.1.x/.helmignore similarity index 100% rename from nexus/v0.1.x/.helmignore rename to molgenis-nexus/v0.1.x/.helmignore diff --git a/nexus/v0.1.x/Chart.yaml b/molgenis-nexus/v0.1.x/Chart.yaml similarity index 100% rename from nexus/v0.1.x/Chart.yaml rename to molgenis-nexus/v0.1.x/Chart.yaml diff --git a/nexus/v0.1.x/catalogIcon-molgenis-nexus.svg b/molgenis-nexus/v0.1.x/catalogIcon-molgenis-nexus.svg similarity index 100% rename from nexus/v0.1.x/catalogIcon-molgenis-nexus.svg rename to molgenis-nexus/v0.1.x/catalogIcon-molgenis-nexus.svg diff --git a/nexus/v0.1.x/templates/_helpers.tpl b/molgenis-nexus/v0.1.x/templates/_helpers.tpl similarity index 100% rename from nexus/v0.1.x/templates/_helpers.tpl rename to molgenis-nexus/v0.1.x/templates/_helpers.tpl diff --git a/nexus/v0.1.x/templates/deployments/httpd-deployment.yaml b/molgenis-nexus/v0.1.x/templates/deployments/httpd-deployment.yaml similarity index 100% rename from nexus/v0.1.x/templates/deployments/httpd-deployment.yaml rename to molgenis-nexus/v0.1.x/templates/deployments/httpd-deployment.yaml diff --git a/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml b/molgenis-nexus/v0.1.x/templates/deployments/nexus-deployment.yaml similarity index 76% rename from nexus/v0.1.x/templates/deployments/nexus-deployment.yaml rename to molgenis-nexus/v0.1.x/templates/deployments/nexus-deployment.yaml index b574e07..521d891 100644 --- a/nexus/v0.1.x/templates/deployments/nexus-deployment.yaml +++ b/molgenis-nexus/v0.1.x/templates/deployments/nexus-deployment.yaml @@ -20,17 +20,17 @@ spec: creationTimestamp: null spec: volumes: - - name: molgenis-nexus-data + - name: {{ .Values.persistance.name }} persistentVolumeClaim: - claimName: molgenis-nexus-data + claimName: {{ .Values.persistance.name }} restartPolicy: {{ .Values.nexus.restartPolicy }} initContainers: - name: volume-mount-nexus image: busybox - command: ["sh", "-c", "chown -R 200:200 /gcc/molgenis/nexus"] + command: ["sh", "-c", "chown -R 200:200 {{ .Values.persistance.mountPath }}"] volumeMounts: - - name: molgenis-nexus-data - mountPath: "/gcc/molgenis/nexus" + - name: {{ .Values.persistance.name }} + mountPath: "{{ .Values.persistance.mountPath }}" containers: - name: {{ .Values.nexus.name }} image: "{{ .Values.nexus.image.repository }}:{{ .Values.nexus.image.tag }}" @@ -39,6 +39,6 @@ spec: - containerPort: {{ .Values.nexus.port.ui }} - containerPort: {{ .Values.nexus.port.docker }} volumeMounts: - - name: molgenis-nexus-data + - name: {{ .Values.persistance.name }} mountPath: "/nexus-data" diff --git a/nexus/v0.1.x/templates/ingress.yaml b/molgenis-nexus/v0.1.x/templates/ingress.yaml similarity index 100% rename from nexus/v0.1.x/templates/ingress.yaml rename to molgenis-nexus/v0.1.x/templates/ingress.yaml diff --git a/nexus/v0.1.x/templates/services/httpd-service.yaml b/molgenis-nexus/v0.1.x/templates/services/httpd-service.yaml similarity index 100% rename from nexus/v0.1.x/templates/services/httpd-service.yaml rename to molgenis-nexus/v0.1.x/templates/services/httpd-service.yaml diff --git a/nexus/v0.1.x/templates/services/nexus-service.yaml b/molgenis-nexus/v0.1.x/templates/services/nexus-service.yaml similarity index 100% rename from nexus/v0.1.x/templates/services/nexus-service.yaml rename to molgenis-nexus/v0.1.x/templates/services/nexus-service.yaml diff --git a/molgenis-nexus/v0.1.x/templates/volumes/nexus-pv.yaml b/molgenis-nexus/v0.1.x/templates/volumes/nexus-pv.yaml new file mode 100644 index 0000000..bfe4fb9 --- /dev/null +++ b/molgenis-nexus/v0.1.x/templates/volumes/nexus-pv.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: {{ .Values.persistance.volumeName }} + labels: + name: nfs2 +spec: + storageClassName: nfs-class + capacity: + storage: {{ .Values.persistance.size }} + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: {{ .Values.persistance.reclaimPolicy }} + nfs: + server: {{ .Values.persistance.server }} + path: {{ .Values.persistance.mountPath }} diff --git a/nexus/v0.1.x/templates/volumes/nexus-pvc.yaml b/molgenis-nexus/v0.1.x/templates/volumes/nexus-pvc.yaml similarity index 50% rename from nexus/v0.1.x/templates/volumes/nexus-pvc.yaml rename to molgenis-nexus/v0.1.x/templates/volumes/nexus-pvc.yaml index 603ecef..8e9f89b 100644 --- a/nexus/v0.1.x/templates/volumes/nexus-pvc.yaml +++ b/molgenis-nexus/v0.1.x/templates/volumes/nexus-pvc.yaml @@ -1,11 +1,11 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: molgenis-nexus-data + name: {{ .Values.persistance.name }} spec: storageClassName: nfs-class accessModes: - - ReadWriteMany + - {{ .Values.persistance.accessMode }} resources: requests: - storage: 50Gi \ No newline at end of file + storage: {{ .Values.persistance.size }} \ No newline at end of file diff --git a/nexus/v0.1.x/values.yaml b/molgenis-nexus/v0.1.x/values.yaml similarity index 89% rename from nexus/v0.1.x/values.yaml rename to molgenis-nexus/v0.1.x/values.yaml index bf186f0..9d2dfdd 100644 --- a/nexus/v0.1.x/values.yaml +++ b/molgenis-nexus/v0.1.x/values.yaml @@ -53,6 +53,15 @@ ingress: # hosts: # - chart-example.local +persistence: + name: molgenis-nexus-data + size: 30G + reclaimPolicy: Retain + server: 192.168.64.12 + accessMode: ReadWriteMany + mountPath: /gcc/molgenis/nexus + + 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 diff --git a/nexus/v0.1.x/templates/volumes/nexus-pv.yaml b/nexus/v0.1.x/templates/volumes/nexus-pv.yaml deleted file mode 100644 index a08d6ba..0000000 --- a/nexus/v0.1.x/templates/volumes/nexus-pv.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: molgenis-nexus-data - labels: - name: nfs2 -spec: - storageClassName: nfs-class - capacity: - storage: 50Gi - accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - nfs: - server: 192.168.64.12 - path: /gcc/molgenis/nexus From e33e6cf627ab6caf9daf83770764c4de2087ff39 Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 18:03:05 +0200 Subject: [PATCH 3/9] bumped version --- molgenis-nexus/{v0.1.x => v0.2.x}/.helmignore | 0 molgenis-nexus/{v0.1.x => v0.2.x}/Chart.yaml | 4 ++-- .../{v0.1.x => v0.2.x}/catalogIcon-molgenis-nexus.svg | 0 molgenis-nexus/{v0.1.x => v0.2.x}/templates/_helpers.tpl | 0 .../templates/deployments/httpd-deployment.yaml | 0 .../templates/deployments/nexus-deployment.yaml | 0 molgenis-nexus/{v0.1.x => v0.2.x}/templates/ingress.yaml | 0 .../{v0.1.x => v0.2.x}/templates/services/httpd-service.yaml | 0 .../{v0.1.x => v0.2.x}/templates/services/nexus-service.yaml | 0 .../{v0.1.x => v0.2.x}/templates/volumes/nexus-pv.yaml | 0 .../{v0.1.x => v0.2.x}/templates/volumes/nexus-pvc.yaml | 0 molgenis-nexus/{v0.1.x => v0.2.x}/values.yaml | 0 12 files changed, 2 insertions(+), 2 deletions(-) rename molgenis-nexus/{v0.1.x => v0.2.x}/.helmignore (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/Chart.yaml (63%) rename molgenis-nexus/{v0.1.x => v0.2.x}/catalogIcon-molgenis-nexus.svg (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/_helpers.tpl (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/deployments/httpd-deployment.yaml (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/deployments/nexus-deployment.yaml (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/ingress.yaml (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/services/httpd-service.yaml (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/services/nexus-service.yaml (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/volumes/nexus-pv.yaml (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/templates/volumes/nexus-pvc.yaml (100%) rename molgenis-nexus/{v0.1.x => v0.2.x}/values.yaml (100%) diff --git a/molgenis-nexus/v0.1.x/.helmignore b/molgenis-nexus/v0.2.x/.helmignore similarity index 100% rename from molgenis-nexus/v0.1.x/.helmignore rename to molgenis-nexus/v0.2.x/.helmignore diff --git a/molgenis-nexus/v0.1.x/Chart.yaml b/molgenis-nexus/v0.2.x/Chart.yaml similarity index 63% rename from molgenis-nexus/v0.1.x/Chart.yaml rename to molgenis-nexus/v0.2.x/Chart.yaml index 00e9117..575a62a 100644 --- a/molgenis-nexus/v0.1.x/Chart.yaml +++ b/molgenis-nexus/v0.2.x/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 appVersion: "1.0" description: Nexus stack for MOLGENIS -name: nexus -version: 0.1.2 +name: molgenis-nexus +version: 0.2.0 icon: https://github.com/sidohaakma/molgenis-docker-helm/blob/master/nexus/catalogIcon-molgenis-nexus.svg \ No newline at end of file diff --git a/molgenis-nexus/v0.1.x/catalogIcon-molgenis-nexus.svg b/molgenis-nexus/v0.2.x/catalogIcon-molgenis-nexus.svg similarity index 100% rename from molgenis-nexus/v0.1.x/catalogIcon-molgenis-nexus.svg rename to molgenis-nexus/v0.2.x/catalogIcon-molgenis-nexus.svg diff --git a/molgenis-nexus/v0.1.x/templates/_helpers.tpl b/molgenis-nexus/v0.2.x/templates/_helpers.tpl similarity index 100% rename from molgenis-nexus/v0.1.x/templates/_helpers.tpl rename to molgenis-nexus/v0.2.x/templates/_helpers.tpl diff --git a/molgenis-nexus/v0.1.x/templates/deployments/httpd-deployment.yaml b/molgenis-nexus/v0.2.x/templates/deployments/httpd-deployment.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/templates/deployments/httpd-deployment.yaml rename to molgenis-nexus/v0.2.x/templates/deployments/httpd-deployment.yaml diff --git a/molgenis-nexus/v0.1.x/templates/deployments/nexus-deployment.yaml b/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/templates/deployments/nexus-deployment.yaml rename to molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml diff --git a/molgenis-nexus/v0.1.x/templates/ingress.yaml b/molgenis-nexus/v0.2.x/templates/ingress.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/templates/ingress.yaml rename to molgenis-nexus/v0.2.x/templates/ingress.yaml diff --git a/molgenis-nexus/v0.1.x/templates/services/httpd-service.yaml b/molgenis-nexus/v0.2.x/templates/services/httpd-service.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/templates/services/httpd-service.yaml rename to molgenis-nexus/v0.2.x/templates/services/httpd-service.yaml diff --git a/molgenis-nexus/v0.1.x/templates/services/nexus-service.yaml b/molgenis-nexus/v0.2.x/templates/services/nexus-service.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/templates/services/nexus-service.yaml rename to molgenis-nexus/v0.2.x/templates/services/nexus-service.yaml diff --git a/molgenis-nexus/v0.1.x/templates/volumes/nexus-pv.yaml b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/templates/volumes/nexus-pv.yaml rename to molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml diff --git a/molgenis-nexus/v0.1.x/templates/volumes/nexus-pvc.yaml b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pvc.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/templates/volumes/nexus-pvc.yaml rename to molgenis-nexus/v0.2.x/templates/volumes/nexus-pvc.yaml diff --git a/molgenis-nexus/v0.1.x/values.yaml b/molgenis-nexus/v0.2.x/values.yaml similarity index 100% rename from molgenis-nexus/v0.1.x/values.yaml rename to molgenis-nexus/v0.2.x/values.yaml From b30a4e6e21d5564a1bfd903fbd3ce50f5db5d4a8 Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 18:06:39 +0200 Subject: [PATCH 4/9] bumped version --- .../templates/deployments/nexus-deployment.yaml | 10 +++++----- .../v0.2.x/templates/volumes/nexus-pv.yaml | 14 +++++++------- .../v0.2.x/templates/volumes/nexus-pvc.yaml | 8 ++++---- molgenis-nexus/v0.2.x/values.yaml | 1 + 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml b/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml index 521d891..af95f78 100644 --- a/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml +++ b/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml @@ -20,17 +20,17 @@ spec: creationTimestamp: null spec: volumes: - - name: {{ .Values.persistance.name }} + - name: {{ .Values.persistence.name }} persistentVolumeClaim: - claimName: {{ .Values.persistance.name }} + claimName: {{ .Values.persistence.name }} restartPolicy: {{ .Values.nexus.restartPolicy }} initContainers: - name: volume-mount-nexus image: busybox - command: ["sh", "-c", "chown -R 200:200 {{ .Values.persistance.mountPath }}"] + command: ["sh", "-c", "chown -R 200:200 {{ .Values.persistence.mountPath }}"] volumeMounts: - name: {{ .Values.persistance.name }} - mountPath: "{{ .Values.persistance.mountPath }}" + mountPath: "{{ .Values.persistence.mountPath }}" containers: - name: {{ .Values.nexus.name }} image: "{{ .Values.nexus.image.repository }}:{{ .Values.nexus.image.tag }}" @@ -39,6 +39,6 @@ spec: - containerPort: {{ .Values.nexus.port.ui }} - containerPort: {{ .Values.nexus.port.docker }} volumeMounts: - - name: {{ .Values.persistance.name }} + - name: {{ .Values.persistence.name }} mountPath: "/nexus-data" diff --git a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml index bfe4fb9..05a4478 100644 --- a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml +++ b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: {{ .Values.persistance.volumeName }} + name: {{ .Values.persistence.volumeName }} labels: name: nfs2 spec: - storageClassName: nfs-class + storageClassName: {{ .Values.persistence.storageClass }} capacity: - storage: {{ .Values.persistance.size }} + storage: {{ .Values.persistence.size }} accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: {{ .Values.persistance.reclaimPolicy }} + - {{ .Values.persistence.accessModes }} + persistentVolumeReclaimPolicy: {{ .Values.persistence.reclaimPolicy }} nfs: - server: {{ .Values.persistance.server }} - path: {{ .Values.persistance.mountPath }} + server: {{ .Values.persistence.server }} + path: {{ .Values.persistence.mountPath }} diff --git a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pvc.yaml b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pvc.yaml index 8e9f89b..3b2d4bb 100644 --- a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pvc.yaml +++ b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pvc.yaml @@ -1,11 +1,11 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ .Values.persistance.name }} + name: {{ .Values.persistence.name }} spec: - storageClassName: nfs-class + storageClassName: {{ .Values.persistence.storageClass }} accessModes: - - {{ .Values.persistance.accessMode }} + - {{ .Values.persistence.accessMode }} resources: requests: - storage: {{ .Values.persistance.size }} \ No newline at end of file + storage: {{ .Values.persistence.size }} \ No newline at end of file diff --git a/molgenis-nexus/v0.2.x/values.yaml b/molgenis-nexus/v0.2.x/values.yaml index 9d2dfdd..32c193c 100644 --- a/molgenis-nexus/v0.2.x/values.yaml +++ b/molgenis-nexus/v0.2.x/values.yaml @@ -55,6 +55,7 @@ ingress: persistence: name: molgenis-nexus-data + storageClass: nfs-class size: 30G reclaimPolicy: Retain server: 192.168.64.12 From eecbf67ff2e43094e45ba8a0f0e0ef08ffd5d8bc Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 18:08:12 +0200 Subject: [PATCH 5/9] bumped version --- .../v0.2.x/templates/deployments/nexus-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml b/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml index af95f78..96d04f4 100644 --- a/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml +++ b/molgenis-nexus/v0.2.x/templates/deployments/nexus-deployment.yaml @@ -29,7 +29,7 @@ spec: image: busybox command: ["sh", "-c", "chown -R 200:200 {{ .Values.persistence.mountPath }}"] volumeMounts: - - name: {{ .Values.persistance.name }} + - name: {{ .Values.persistence.name }} mountPath: "{{ .Values.persistence.mountPath }}" containers: - name: {{ .Values.nexus.name }} From 80c2085bfebbd5378e45050e7bfb051c59969137 Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 18:10:11 +0200 Subject: [PATCH 6/9] bumped version --- molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml index 05a4478..b5b5161 100644 --- a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml +++ b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml @@ -9,7 +9,7 @@ spec: capacity: storage: {{ .Values.persistence.size }} accessModes: - - {{ .Values.persistence.accessModes }} + - {{ .Values.persistence.accessMode }} persistentVolumeReclaimPolicy: {{ .Values.persistence.reclaimPolicy }} nfs: server: {{ .Values.persistence.server }} From bd68f93383df1f51efaaff7b3e039ff8f53b67ee Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 18:15:06 +0200 Subject: [PATCH 7/9] updated name --- molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml index b5b5161..95c6f71 100644 --- a/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml +++ b/molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: {{ .Values.persistence.volumeName }} + name: {{ .Values.persistence.name }} labels: name: nfs2 spec: From 120a4afba487dd8bec87d153183a9e1f325bac18 Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 21:20:13 +0200 Subject: [PATCH 8/9] fix: updated readme --- README.md | 81 ++++++++++++++++--- .../templates/services/httpd-service.yaml | 13 --- 2 files changed, 68 insertions(+), 26 deletions(-) delete mode 100644 molgenis-nexus/v0.2.x/templates/services/httpd-service.yaml diff --git a/README.md b/README.md index 70131ce..b010974 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,94 @@ # MOLGENIS Helm templates -These are the Helm templates that we will use for MOLGENIS operations. There are some prerequisites you need. +These are the Helm templates that we will use for MOLGENIS operations. Basic concepts in respect to docker you need to know. + +**Deployments** + +Are a set of pods that will be deployed according to configuration that is usually managed bij Helm. These pods interact with eachother by being in the same namespace created by kubernetes according to the deployment configuration. + +**Pods** + +A pod is wrapper around a container. It will recreate the container when it is shutdown for some reason and interact with other pods when needed. + +**Containers** + +A container is a docker-container that is created from a docker image. It could be seen as an VM for example + +**Images** + +An image is a template for a container some sort of boot script but also contains the os for example. A build dockerfile, if you will. + +**Prerequisites** + +There are some prerequisites you need. - docker - minikube -## Useful commands for Kubernetes +## Kubernetes + +When you want to use kubernetes there are some commands you need to know. Also running on a remote cluster will be a must have to control your whole DTAP. + +### Useful commands Commands that can be used to get information from a kubernetes cluster -- kubectl get pods +- ```kubectl get pods``` + Gets alls running instances of containers from a certain deployment -- kubectl get services +- ```kubectl get services``` + Gets all services from a deployment -- kubectl get pv +- ```kubectl get pv``` + Gets all persistant volumes -- kubectl get pvc +- ```kubectl get pvc``` + Gets all persistent volume claims -- kubectl get deployments +- ```kubectl get deployments``` + Gets all deployments (comparable with docker-compose) +## Remote clusters + When you want to see what is running on the clusters at the CIT you have to make a context switch. You can access the cluster with kubeconfig-files. You can obtain these by downloading them from the MOLGENIS kubernetes cluster. -- Goto https://rancher.molgenis.org:7443 -- Goto +- Go to https://rancher.molgenis.org:7443 and login +- Go to Rancher --> Cluster: *#name#* --> *Kubeconfig File* +- Go to a **Terminal** where ```kubectl``` is available +- Add this configuration to ~/.kube/config (or place a new file besides this one) + + *Example*: +```bash +# When you added the MOLGENIS configuration to the original configuration +kubectl config user-context molgenis + +# or when you placed the MOLGENIS configuration besides the original one +kubectl config use-context molgenis --kubeconfig=*full path to molgenis config* +``` +- You can now access all facilities of the MOLGENIS cluster like it is running locally + + *Example:* +```bash +kubectl get pods --namespace=*#namespace of application#* + +``` + +## Helm + +### Useful commands -## Useful commands for Helm -- helm install . +- ```helm install .``` + Do it in the root of the project where the Chart.yaml is located It installs a release of a kubernetes stack. You also store this as an artifact in a kubernetes repository -- helm list +- ```helm list``` + Lists all installed releases -- helm delete #release# +- ```helm delete #release#a``` + Performs a sort of mvn clean on your workspace. Very handy for zombie persistent volumes or claims. \ No newline at end of file diff --git a/molgenis-nexus/v0.2.x/templates/services/httpd-service.yaml b/molgenis-nexus/v0.2.x/templates/services/httpd-service.yaml deleted file mode 100644 index 5b3d939..0000000 --- a/molgenis-nexus/v0.2.x/templates/services/httpd-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ .Values.httpd.name }} - labels: - app: {{ .Values.httpd.name }} -spec: - type: NodePort - ports: - - name: {{ .Values.httpd.name }} - port: {{ .Values.httpd.port }} - selector: - app: {{ .Values.httpd.selector }} From 628825475a1f4d10950eaea4724154dac203054b Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 27 Jun 2018 22:12:27 +0200 Subject: [PATCH 9/9] updated documentation --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b010974..77487ea 100644 --- a/README.md +++ b/README.md @@ -73,15 +73,18 @@ kubectl config use-context molgenis --kubeconfig=*full path to molgenis config* *Example:* ```bash kubectl get pods --namespace=*#namespace of application#* - ``` ## Helm +This repository is serves also as a catalogue for Rancher. We have serveral apps that are served through this repoistory. e.g. + +- [Jenkins](molgenis-jenkins/README.md) +- [NEXUS](molgenis-nexus/README.md) +- [HTTPD](molgenis-httpd/README.md) + ### Useful commands - - - ```helm install .``` Do it in the root of the project where the Chart.yaml is located @@ -91,4 +94,5 @@ kubectl get pods --namespace=*#namespace of application#* Lists all installed releases - ```helm delete #release#a``` - Performs a sort of mvn clean on your workspace. Very handy for zombie persistent volumes or claims. \ No newline at end of file + Performs a sort of mvn clean on your workspace. Very handy for zombie persistent volumes or claims. + \ No newline at end of file