requirements updated

charts/opal/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: mysql
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  version: 0.10.2
+digest: sha256:77710fe100fb005d51e006d2e19643f9af2b1aadd1c2249c67ffc5be6a095f30
+generated: 2018-10-24T22:38:04.939630519+02:00

charts/opal/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - name: mysql
-    version: ^0.16
+    version: ^0.10.2
     repository: https://kubernetes-charts.storage.googleapis.com/

charts/opal/templates/persistence/mysql-pvc.yaml

@@ -15,15 +15,11 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-    {{- if eq .Values.persistence.mysql.size "default" }}
+    {{- if eq .Values.opal.type.kind "small" }}
-      {{- if eq .Values.opal.type.kind "small" }}
       storage: {{ .Values.mysql.type.small.persistence.size }}
-      {{- else if eq .Values.opal.type.kind "medium" }}
+    {{- else if eq .Values.opal.type.kind "medium" }}
       storage: {{ .Values.mysql.type.medium.persistence.size }}
-      {{- else }}
+    {{- else }}
       storage: {{ .Values.mysql.type.large.persistence.size }}
-      {{- end }}
-    {{ else }}
-        storage: {{ .Values.persistence.mysql.size }}
     {{- end }}
 {{- end }}

charts/opal/templates/persistence/opal-pvc.yaml

@@ -15,15 +15,11 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-    {{- if eq .Values.persistence.opal.size "default" }}
+    {{- if eq .Values.opal.type.kind "small" }}
-      {{- if eq .Values.opal.type.kind "small" }}
       storage: {{ .Values.opal.type.small.persistence.size }}
-      {{- else if eq .Values.opal.type.kind "medium" }}
+    {{- else if eq .Values.opal.type.kind "medium" }}
       storage: {{ .Values.opal.type.medium.persistence.size }}
-      {{- else }}
+    {{- else }}
       storage: {{ .Values.opal.type.large.persistence.size }}
-      {{- end }}
-    {{ else }}
-      storage: {{ .Values.persistence.opal.size }}
     {{- end }}
 {{- end }}

charts/opal/values.yaml

@@ -69,70 +69,26 @@ opal:
   image:
     repository: registry.hub.docker.com
     name: obiba/opal
-    tag: stable
+    tag: latest
     pullPolicy: Always
   adminPassword:
   persistence:
-    claim: opal-nfs-claim
+    claim: pvc-opal
   services:
     rserver:
       host: localhost
     mysql:
       host: localhost
 
-
 rserver:
   image:
     repository: obiba/opal-rserver
-    tag: stable
+    tag: latest
     pullPolicy: IfNotPresent
 
-mysql:
-  type:
-    small:
-      resources:
-        limits:
-          cpu: 1
-          memory: 512Mi
-        requests:
-          cpu: 100m
-          memory: 512Mi
-      persistence:
-        size: 5Gi
-    medium:
-      resources:
-        limits:
-          cpu: 2
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 2Gi
-      persistence:
-        size: 10Gi
-    large:
-      resources:
-        limits:
-          cpu: 4
-          memory: 4Gi
-        requests:
-          cpu: 100m
-          memory: 4Gi
-      persistence:
-        size: 15Gi
-  image:
-    repository: postgres
-    tag: 9.6-alpine
-    pullPolicy: IfNotPresent
-  persistence:
-    claim: mysql-nfs-claim
-
 persistence:
   enabled: true
   retain: false
-  opal:
-    size: "default"
-  mysql:
-    size: "default"
 
 nodeSelector: {
   deployPod: "true"