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