README.md

@@ -1,98 +1,39 @@
 # MOLGENIS Helm templates
 
-These are the Helm templates that we will use for MOLGENIS operations. Basic concepts in respect to docker you need to know.
+These are the Helm templates that we will use for MOLGENIS operations. There are some prerequisites you need.
-
-**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
  
-## Kubernetes
+## Useful commands for 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.
 
-- Go to https://rancher.molgenis.org:7443 and login
+- Goto https://rancher.molgenis.org:7443
-- Go to Rancher --> Cluster: *#name#* --> *Kubeconfig File*
+- Goto 
-- 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
+## Useful commands for Helm
-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
-
-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 .```
 
+- 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#a```
+- helm delete #release#
-  
   Performs a sort of mvn clean on your workspace. Very handy for zombie persistent volumes or claims.
-  

molgenis-nexus/v0.2.x/templates/volumes/nexus-pv.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ .Values.persistence.name }}
-  labels:
-    name: nfs2
-spec:
-  storageClassName: {{ .Values.persistence.storageClass }}
-  capacity:
-    storage: {{ .Values.persistence.size }}
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  persistentVolumeReclaimPolicy: {{ .Values.persistence.reclaimPolicy }}
-  nfs:
-    server: {{ .Values.persistence.server }}
-    path: {{ .Values.persistence.mountPath }}

molgenis-nexus/v0.2.x/templates/volumes/nexus-pvc.yaml

@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ .Values.persistence.name }}
-spec:
-  storageClassName: {{ .Values.persistence.storageClass }}
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}

nexus/v0.1.x/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 appVersion: "1.0"
 description: Nexus stack for MOLGENIS
-name: molgenis-nexus
+name: nexus
-version: 0.2.0
+version: 0.1.2
 icon: https://github.com/sidohaakma/molgenis-docker-helm/blob/master/nexus/catalogIcon-molgenis-nexus.svg

nexus/v0.1.x/templates/deployments/nexus-deployment.yaml

@@ -20,17 +20,17 @@ spec:
       creationTimestamp: null
     spec:
       volumes:
-      - name: {{ .Values.persistence.name }}
+      - name: molgenis-nexus-data
         persistentVolumeClaim:
-          claimName: {{ .Values.persistence.name }}
+          claimName: molgenis-nexus-data
       restartPolicy: {{ .Values.nexus.restartPolicy }}
       initContainers:
       - name: volume-mount-nexus
         image: busybox
-        command: ["sh", "-c", "chown -R 200:200 {{ .Values.persistence.mountPath }}"]
+        command: ["sh", "-c", "chown -R 200:200 /gcc/molgenis/nexus"]
         volumeMounts:
-        - name: {{ .Values.persistence.name }}
+        - name: molgenis-nexus-data
-          mountPath: "{{ .Values.persistence.mountPath }}"
+          mountPath: "/nexus-data"
       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.persistence.name }}
+        - name: molgenis-nexus-data
           mountPath: "/nexus-data"
 

nexus/v0.1.x/templates/services/httpd-service.yaml

@@ -0,0 +1,13 @@
+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 }}

nexus/v0.1.x/templates/volumes/nexus-pv.yaml

@@ -0,0 +1,16 @@
+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

nexus/v0.1.x/templates/volumes/nexus-pvc.yaml

@@ -0,0 +1,11 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: molgenis-nexus-data
+spec:
+  storageClassName: nfs-class
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 50Gi

nexus/v0.1.x/values.yaml

@@ -53,16 +53,6 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-persistence:
-  name: molgenis-nexus-data
-  storageClass: nfs-class
-  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