From fba3d1221b9ec1b8421a693ad5ef4aa5362c5b99 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Sun, 26 Jul 2020 20:34:45 -0500
Subject: [PATCH] Fix deployment volume indentation and add missing volume
mounts
---
.../templates/deployment.yaml | 38 ++++++++++++-------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/chart/geosphere-mapserver/templates/deployment.yaml b/chart/geosphere-mapserver/templates/deployment.yaml
index d6e76b4..6179055 100644
--- a/chart/geosphere-mapserver/templates/deployment.yaml
+++ b/chart/geosphere-mapserver/templates/deployment.yaml
@@ -20,20 +20,20 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
- volumes:
- {{- if .Values.source.existingClaim }}
- - name: src
- persistentVolumeClaim:
- claimName: "{{ .Values.source.existingClaim }}"
- {{- else }}
- # TODO: For testing only (should require s3 source)
- - name: src
- emptyDir: {}
- {{- end }}
- # put shapefiles in memory storage (small)
- - name: dst
- emptyDir:
- medium: Memory
+ volumes:
+ {{- if .Values.source.existingClaim }}
+ - name: src
+ persistentVolumeClaim:
+ claimName: "{{ .Values.source.existingClaim }}"
+ {{- else }}
+ # TODO: For testing only (should require s3 source)
+ - name: src
+ emptyDir: {}
+ {{- end }}
+ # put shapefiles in memory storage (small)
+ - name: dst
+ emptyDir:
+ medium: Memory
containers:
- name: {{ .Chart.Name }}
securityContext:
@@ -47,6 +47,11 @@ spec:
value: "{{ join " " .Values.platforms }}"
- name: WMS_SECTORS
value: "{{ join " " .Values.sectors }}"
+ volumeMounts:
+ - name: src
+ mountPath: "/data"
+ - name: dst
+ mountPath: "/dst"
ports:
- name: http
containerPort: 80
@@ -66,6 +71,11 @@ spec:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.tileGen.repository }}:{{ .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.tileGen.pullPolicy }}
+ volumeMounts:
+ - name: src
+ mountPath: "/data"
+ - name: dst
+ mountPath: "/dst"
env:
- name: G2G_PRODUCTS
value: "{{ join " " .Values.products }}"
--
GitLab