From 5e0ee2e5e7d013dc9973c280a17cf013195b80b8 Mon Sep 17 00:00:00 2001 From: sido Date: Tue, 30 Oct 2018 12:24:17 +0100 Subject: [PATCH] requirements updated --- charts/opal/charts/mysql-0.10.2.tgz | Bin 0 -> 8978 bytes charts/opal/requirements.lock | 6 +++ charts/opal/requirements.yaml | 2 +- .../{mysqlPVC.yaml => mysql-pvc.yaml} | 10 ++-- .../{opalPVC.yaml => opal-pvc.yaml} | 10 ++-- charts/opal/values.yaml | 50 ++---------------- 6 files changed, 16 insertions(+), 62 deletions(-) create mode 100644 charts/opal/charts/mysql-0.10.2.tgz create mode 100644 charts/opal/requirements.lock rename charts/opal/templates/persistence/{mysqlPVC.yaml => mysql-pvc.yaml} (70%) rename charts/opal/templates/persistence/{opalPVC.yaml => opal-pvc.yaml} (70%) diff --git a/charts/opal/charts/mysql-0.10.2.tgz b/charts/opal/charts/mysql-0.10.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..110868e860f40da1c17551c131816589d25cd97e GIT binary patch literal 8978 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 literal 0 HcmV?d00001 diff --git a/charts/opal/requirements.lock b/charts/opal/requirements.lock new file mode 100644 index 0000000..5260a04 --- /dev/null +++ b/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 diff --git a/charts/opal/requirements.yaml b/charts/opal/requirements.yaml index c417d27..74d6955 100644 --- a/charts/opal/requirements.yaml +++ b/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/ \ No newline at end of file diff --git a/charts/opal/templates/persistence/mysqlPVC.yaml b/charts/opal/templates/persistence/mysql-pvc.yaml similarity index 70% rename from charts/opal/templates/persistence/mysqlPVC.yaml rename to charts/opal/templates/persistence/mysql-pvc.yaml index cfe9b9b..d02a99d 100644 --- a/charts/opal/templates/persistence/mysqlPVC.yaml +++ b/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 }} \ No newline at end of file diff --git a/charts/opal/templates/persistence/opalPVC.yaml b/charts/opal/templates/persistence/opal-pvc.yaml similarity index 70% rename from charts/opal/templates/persistence/opalPVC.yaml rename to charts/opal/templates/persistence/opal-pvc.yaml index 9aefc35..72a0c6b 100644 --- a/charts/opal/templates/persistence/opalPVC.yaml +++ b/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 }} \ No newline at end of file diff --git a/charts/opal/values.yaml b/charts/opal/values.yaml index 55736a6..1f1228a 100644 --- a/charts/opal/values.yaml +++ b/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"