From 5701de824afeea3765784d4ceea66ef6e23890ad Mon Sep 17 00:00:00 2001 From: Andy Verberne Date: Thu, 29 Apr 2021 14:59:03 +0200 Subject: [PATCH 1/2] Fixes #6 -- Removes media volume from open notificaties --- charts/open-notificaties/README.md | 3 --- charts/open-notificaties/templates/deployment.yaml | 11 ----------- charts/open-notificaties/templates/pvc.yaml | 14 -------------- charts/open-notificaties/values.yaml | 5 ----- 4 files changed, 33 deletions(-) delete mode 100644 charts/open-notificaties/templates/pvc.yaml diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index 7cc1466..c3c299b 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -40,9 +40,6 @@ helm install open-notificaties open-zaak/open-notificaties \ | `ingress.annotations` | Additional annotations on the API ingress | `{}` | | `ingress.hosts` | Ingress hosts | `"{open-notificaties.gemeente.nl}"` | | `ingress.tls` | Ingress TLS settings | `"[]"` | -| `persistence.enabled` | Enable persistency for application media | `false` | -| `persistence.size` | The size of the application media persistent volume | `"1Gi"` | -| `persistence.existingClaim` | Use an existing claim for application media | `null` | | `settings.allowedHosts` | A comma-separated list of hosts allowed by the application | `"open-notificaties.gemeente.nl"` | | `settings.secretKey` | The secret key of the application | `"SOME-RANDOM-SECRET"` | | `settings.database.host` | The hostname of PostgreSQL | `"open-notificaties-postgresql"` | diff --git a/charts/open-notificaties/templates/deployment.yaml b/charts/open-notificaties/templates/deployment.yaml index a1d869d..8ccc6f0 100644 --- a/charts/open-notificaties/templates/deployment.yaml +++ b/charts/open-notificaties/templates/deployment.yaml @@ -62,17 +62,6 @@ spec: {{- toYaml .Values.readinessProbe | nindent 12 }} resources: {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: media - mountPath: /media - volumes: - - name: media - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ include "open-notificaties.fullname" . }}{{- end }} - {{- else }} - emptyDir: {} - {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/open-notificaties/templates/pvc.yaml b/charts/open-notificaties/templates/pvc.yaml deleted file mode 100644 index 87d11c1..0000000 --- a/charts/open-notificaties/templates/pvc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ include "open-notificaties.fullname" . }} - labels: - {{- include "open-notificaties.labels" . | nindent 4 }} -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: {{ .Values.persistence.size }} -{{- end }} diff --git a/charts/open-notificaties/values.yaml b/charts/open-notificaties/values.yaml index 4c7b32a..0ecab89 100644 --- a/charts/open-notificaties/values.yaml +++ b/charts/open-notificaties/values.yaml @@ -87,11 +87,6 @@ tolerations: [] affinity: {} -persistence: - enabled: false - size: 1Gi - existingClaim: null - worker: replicaCount: 1 resources: {} From d65433a90feceaf71c8954e1a5450ba4bd1f3768 Mon Sep 17 00:00:00 2001 From: Andy Verberne Date: Thu, 29 Apr 2021 16:12:58 +0200 Subject: [PATCH 2/2] Fixes #6 -- Increment Helm chart version --- charts/open-notificaties/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/open-notificaties/Chart.yaml b/charts/open-notificaties/Chart.yaml index 9bd9dc4..5d388f9 100644 --- a/charts/open-notificaties/Chart.yaml +++ b/charts/open-notificaties/Chart.yaml @@ -3,7 +3,7 @@ name: open-notificaties description: API voor het routeren van notificaties type: application -version: 0.3.0 +version: 0.3.1 appVersion: 1.1.0 dependencies: