Merge branch 'implement-nfs-provisioning-nexus' of p281392/molgenis-ops-docker-helm into master

2018-09-26 16:34:34 +02:00 · 2018-09-26 16:34:34 +02:00 · 35c7fd79af
commit 35c7fd79af
parent 95dc0acabd a4c4d19fe2
10 changed files with 128 additions and 122 deletions
--- a/molgenis-nexus/templates/deployments/httpd-deployment.yaml
+++ b/molgenis-nexus/templates/deployments/httpd-deployment.yaml
@ -1,34 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  creationTimestamp: null
-  name: {{ .Values.httpd.name }}
-  labels:
-    app: {{ .Values.httpd.name }}
-    environment: {{ .Values.environment }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  strategy:
-    type: {{ .Values.httpd.strategy.type }}
-  selector:
-    matchLabels:
-      app: {{ .Values.httpd.selector }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Values.httpd.name }}
-      creationTimestamp: null
-    spec:
-      restartPolicy: {{ .Values.httpd.restartPolicy }}
-      containers:
-      - name: {{ .Values.httpd.name }}
-        image: "{{ .Values.httpd.image.repository }}:{{ .Values.httpd.image.tag }}"
-        imagePullPolicy: {{ .Values.httpd.image.pullPolicy }}
-        env:
-        - name: PROXY_SERVICE
-          value: "{{ .Values.nexus.name }}:{{ .Values.nexus.port.ui }},{{ .Values.nexus.name }}:{{ .Values.nexus.port.docker }}:{{ .Values.nexus.path.dockerV2 }}"
-        - name: SERVER_NAME
-          value: {{ .Values.httpd.hostname }}
-        ports:
-        - containerPort: {{ .Values.httpd.port }}
-        resources: {}
--- a/molgenis-nexus/templates/deployments/nexus-deployment.yaml
+++ b/molgenis-nexus/templates/deployments/nexus-deployment.yaml
@ -19,26 +19,40 @@ spec:
        app: {{ .Values.nexus.name }}
      creationTimestamp: null
    spec:
-      volumes:
-      - name: {{ .Values.persistence.name }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.name }}
      restartPolicy: {{ .Values.nexus.restartPolicy }}
-      initContainers:
-      - name: volume-mount-nexus
-        image: busybox
-        command: ["sh", "-c", "chown -R 200:200 {{ .Values.persistence.mountPath }}"]
-        volumeMounts:
-        - name: {{ .Values.persistence.name }}
-          mountPath: "{{ .Values.persistence.mountPath }}"
      containers:
-      - name: {{ .Values.nexus.name }}
-        image: "{{ .Values.nexus.image.repository }}:{{ .Values.nexus.image.tag }}"
-        imagePullPolicy: {{ .Values.nexus.image.pullPolicy }}
-        ports:
-        - containerPort: {{ .Values.nexus.port.ui }}
-        - containerPort: {{ .Values.nexus.port.docker }}
-        volumeMounts:
-        - name: {{ .Values.persistence.name }}
-          mountPath: "/nexus-data"
+        - name: {{ .Values.nexus.name }}
+          image: "{{ .Values.nexus.image.repository }}:{{ .Values.nexus.image.tag }}"
+          imagePullPolicy: {{ .Values.nexus.image.pullPolicy }}
+          ports:
+          - containerPort: {{ .Values.nexus.port.ui }}
+          - containerPort: {{ .Values.nexus.port.docker }}
+          volumeMounts:
+          - name: molgenis-nexus-nfs
+            mountPath: "/nexus-data"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.nexus.port.ui }}
+            initialDelaySeconds: 90
+            periodSeconds: 20
+            failureThreshold: 5
+            successThreshold: 1
+          readinessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.nexus.port.ui }}
+            initialDelaySeconds: 90
+            periodSeconds: 5
+            failureThreshold: 5
+            successThreshold: 1

+      volumes:
+        - name: molgenis-nexus-nfs
+          persistentVolumeClaim:
+            claimName: {{ .Values.persistence.claim }}
+
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
--- a/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml
+++ b/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml
@ -0,0 +1,55 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  creationTimestamp: null
+  name: {{ .Values.nexusProxy.name }}
+  labels:
+    app: {{ .Values.nexusProxy.name }}
+    environment: {{ .Values.environment }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.nexusProxy.strategy.type }}
+  selector:
+    matchLabels:
+      app: {{ .Values.nexusProxy.selector }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.nexusProxy.name }}
+      creationTimestamp: null
+    spec:
+      restartPolicy: {{ .Values.nexusProxy.restartPolicy }}
+      containers:
+      - name: {{ .Values.nexusProxy.name }}
+        image: "{{ .Values.nexusProxy.image.repository }}:{{ .Values.nexusProxy.image.tag }}"
+        imagePullPolicy: {{ .Values.nexusProxy.image.pullPolicy }}
+        env:
+        - name: PROXY_SERVICE
+          value: "{{ .Values.nexus.name }}:{{ .Values.nexus.port.ui }},{{ .Values.nexus.name }}:{{ .Values.nexus.port.docker }}:{{ .Values.nexus.path.dockerV2 }}"
+        - name: SERVER_NAME
+          value: {{ .Values.nexusProxy.hostname }}
+        ports:
+        - containerPort: {{ .Values.nexusProxy.port }}
+        resources: {}
+        livenessProbe:
+          httpGet:
+            path: /
+            port: {{ .Values.nexusProxy.port }}
+          initialDelaySeconds: 90
+          periodSeconds: 5
+          failureThreshold: 5
+          successThreshold: 1
+        readinessProbe:
+          httpGet:
+            path: /
+            port: {{ .Values.nexusProxy.port }}
+          initialDelaySeconds: 90
+          periodSeconds: 5
+          failureThreshold: 5
+          successThreshold: 1
+
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
--- a/molgenis-nexus/templates/ingress.yaml
+++ b/molgenis-nexus/templates/ingress.yaml
@ -25,8 +25,8 @@ spec:
      paths:
        - path: {{ default "/" .path }}
          backend:
-            serviceName: httpd
-            servicePort: 80
+            serviceName: {{ $.Values.nexusProxy.name }}
+            servicePort: {{ $.Values.nexusProxy.port }}
 {{- if .tls }}
  tls:
  - hosts:
--- a/molgenis-nexus/templates/persistence/nexusPVC.yaml
+++ b/molgenis-nexus/templates/persistence/nexusPVC.yaml
@ -0,0 +1,15 @@
+{{- if .Values.persistence.enabled -}}
+apiVersion: extensions/v1beta1
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ .Values.persistence.claim }}
+  annotations:
+    volume.beta.kubernetes.io/storage-class: "nfs-provisioner-retain"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}
+{{- end }}
--- a/molgenis-nexus/templates/services/httpd-service.yaml
+++ b/molgenis-nexus/templates/services/httpd-service.yaml
@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.httpd.name }}
-  labels:
-    app: {{ .Values.httpd.name }}
-spec:
-  type: {{ .Values.httpd.service.type }}
-  ports:
-  - name: {{ .Values.httpd.name }}
-    port: {{ .Values.httpd.port }}
-  selector:
-    app: {{ .Values.httpd.selector }}
--- a/molgenis-nexus/templates/services/nexusProxy-service.yaml
+++ b/molgenis-nexus/templates/services/nexusProxy-service.yaml
@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.nexusProxy.name }}
+  labels:
+    app: {{ .Values.nexusProxy.name }}
+spec:
+  type: {{ .Values.nexusProxy.service.type }}
+  ports:
+  - name: {{ .Values.nexusProxy.name }}
+    port: {{ .Values.nexusProxy.port }}
+  selector:
+    app: {{ .Values.nexusProxy.selector }}
--- a/molgenis-nexus/templates/volumes/nexus-pv.yaml
+++ b/molgenis-nexus/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 }}
--- a/molgenis-nexus/templates/volumes/nexus-pvc.yaml
+++ b/molgenis-nexus/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 }}
--- a/molgenis-nexus/values.yaml
+++ b/molgenis-nexus/values.yaml
@ -24,12 +24,12 @@ nexus:
  service:
    type: ClusterIP

-httpd:
-  name: httpd
+nexusProxy:
+  name: nexus-proxy
  hostname: registry.molgenis.org
  strategy:
    type: Recreate
-  selector: httpd
+  selector: nexus-proxy
  restartPolicy: Always
  image:
    repository: registry.webhosting.rug.nl/molgenis/httpd
@ -43,39 +43,22 @@ httpd:
 ingress:
  enabled: true
  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
  path: /
  hosts:
  - name: registry.molgenis.org
  tls: []
-  #  - secretName: chart-example-tls
-  #    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
+  enabled: true
+  claim: molgenis-nexus
+  size: 500Gi


 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
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi

-nodeSelector: {}
+nodeSelector: {
+  deployPod: "true"
+}

 tolerations: []