Update cgimap config

Author: Rub21

osm-seed/templates/cgimap/cgimap-deployment.yaml

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "osm-seed.fullname" . }}-cgimap
+  name: {{ .Release.Name }}-cgimap
   labels:
     app: {{ template "osm-seed.name" . }}
     component: cgimap-deployment
@@ -27,14 +27,18 @@ spec:
           image: "{{ .Values.cgimap.image.name }}:{{ .Values.cgimap.image.tag }}"
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8000
               protocol: TCP
           livenessProbe:
-            httpGet:
-              path: /
-              port: 80
-            initialDelaySeconds: 600 # 10 min, because the compile process takes time.
-            timeoutSeconds: 30
+            exec:
+              command:
+              - /bin/bash
+              - -c
+              - /liveness.sh
+            initialDelaySeconds: 30
+            timeoutSeconds: 5
+            periodSeconds: 10
+            failureThreshold: 3
           {{- if .Values.cgimap.resources.enabled }}
           resources:
             requests:
@@ -49,14 +53,12 @@ spec:
               value: {{ .Release.Name }}-db
             - name: POSTGRES_DB
               value: {{ .Values.db.env.POSTGRES_DB }}
+            - name: PGPASSWORD
+              value: {{ quote .Values.db.env.POSTGRES_PASSWORD }}
             - name: POSTGRES_PASSWORD
               value: {{ quote .Values.db.env.POSTGRES_PASSWORD }}
             - name: POSTGRES_USER
               value: {{ .Values.db.env.POSTGRES_USER }}
-            - name: API_WEB_HOST
-              value: {{ .Release.Name }}-web
-            - name: API_WEB_PORT
-              value: 80
       {{- if .Values.cgimap.nodeSelector.enabled }}
       nodeSelector:
         {{ .Values.cgimap.nodeSelector.label_key }} : {{ .Values.cgimap.nodeSelector.label_value }}

osm-seed/templates/cgimap/cgimap-ingress.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "osm-seed.fullname" . }}-cgimap
+  name: {{ .Release.Name }}-cgimap
   labels:
     app: {{ template "osm-seed.name" . }}
     component: cgimap-service
@@ -30,14 +30,8 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-  {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
-    - port: 443
-      targetPort: http
-      protocol: TCP
-      name: https
-  {{- end }}
   selector:
     app: {{ template "osm-seed.name" . }}
     release: {{ .Release.Name }}
     run: {{ .Release.Name }}-cgimap
-{{- end }}
+{{- end }}

osm-seed/templates/cgimap/cgimap-service.yaml

@@ -154,6 +154,10 @@ spec:
               value: {{ .Values.web.env.RAILS_STORAGE_REGION | quote }}
             - name: RAILS_STORAGE_BUCKET
               value: {{ .Values.web.env.RAILS_STORAGE_BUCKET | quote }}
+            - name: CGIMAP_URL
+              value: {{ .Release.Name }}-cgimap
+            - name: CGIMAP_PORT
+              value: {{ quote 80 }}
           volumeMounts:
             - mountPath: /dev/shm
               name: shared-memory