From 63bedcea84ed5b95917c375fe65750f1b18d3ebe Mon Sep 17 00:00:00 2001 From: sido Date: Tue, 6 Nov 2018 09:26:27 +0100 Subject: [PATCH] updated configuration for cluster deployment --- charts/opal/templates/deployment.yaml | 2 +- .../templates/{persistence => }/opal-pvc.yaml | 2 +- .../opal/templates/persistence/mysql-pvc.yaml | 19 ------------------- charts/opal/values.yaml | 9 +++------ 4 files changed, 5 insertions(+), 27 deletions(-) rename charts/opal/templates/{persistence => }/opal-pvc.yaml (86%) delete mode 100644 charts/opal/templates/persistence/mysql-pvc.yaml diff --git a/charts/opal/templates/deployment.yaml b/charts/opal/templates/deployment.yaml index 9db3e98..c6dcaf4 100644 --- a/charts/opal/templates/deployment.yaml +++ b/charts/opal/templates/deployment.yaml @@ -74,7 +74,7 @@ spec: volumes: - name: opal-nfs persistentVolumeClaim: - claimName: {{ .Values.opal.persistence.claim }} + claimName: {{ .Release.Name }}-{{ .Values.opal.persistence.claim }} {{- end }} {{- with .Values.nodeSelector }} diff --git a/charts/opal/templates/persistence/opal-pvc.yaml b/charts/opal/templates/opal-pvc.yaml similarity index 86% rename from charts/opal/templates/persistence/opal-pvc.yaml rename to charts/opal/templates/opal-pvc.yaml index a19a44e..f2efecd 100644 --- a/charts/opal/templates/persistence/opal-pvc.yaml +++ b/charts/opal/templates/opal-pvc.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ .Values.opal.persistence.claim }} + name: {{ .Release.Name }}-{{ .Values.opal.persistence.claim }} annotations: {{- if .Values.persistence.retain }} volume.beta.kubernetes.io/storage-class: "nfs-provisioner-retain" diff --git a/charts/opal/templates/persistence/mysql-pvc.yaml b/charts/opal/templates/persistence/mysql-pvc.yaml deleted file mode 100644 index 61ba8e9..0000000 --- a/charts/opal/templates/persistence/mysql-pvc.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if .Values.persistence.enabled }} -apiVersion: extensions/v1beta1 -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ .Values.mysql.persistence.claim }} - annotations: - {{- if .Values.persistence.retain }} - volume.beta.kubernetes.io/storage-class: "nfs-provisioner-retain" - {{- else }} - volume.beta.kubernetes.io/storage-class: "nfs-provisioner" - {{- end }} -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: {{ .Values.mysql.persistence.size }} -{{- end }} \ No newline at end of file diff --git a/charts/opal/values.yaml b/charts/opal/values.yaml index 43bdb90..9482998 100644 --- a/charts/opal/values.yaml +++ b/charts/opal/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 service: - type: LoadBalancer + type: ClusterIP port: 8080 ingress: @@ -11,7 +11,7 @@ ingress: annotations: nginx.ingress.kubernetes.io/proxy-body-size: "0" hosts: - - name: opal.dev.molgenis.org + - opal.dev.molgenis.org path: / tls: [] @@ -36,6 +36,7 @@ opal: adminPassword: persistence: claim: pvc-opal + size: 10Gi services: rserver: host: localhost @@ -48,10 +49,6 @@ rserver: tag: latest pullPolicy: IfNotPresent -mysql: - persistence: - size: 10Gi - persistence: enabled: true retain: false