Pass env vars in web container for cgimap

Author: Rub21

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

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}-cgimap
+  name: {{ .Release.Name }}-cgimap-deployment
   labels:
     app: {{ template "osm-seed.name" . }}
     component: cgimap-deployment
@@ -14,13 +14,13 @@ spec:
     matchLabels:
       app: {{ template "osm-seed.name" . }}
       release: {{ .Release.Name }}
-      run: {{ .Release.Name }}-cgimap
+      run: {{ .Release.Name }}-cgimap-deployment
   template:
     metadata:
       labels:
         app: {{ template "osm-seed.name" . }}
         release: {{ .Release.Name }}
-        run: {{ .Release.Name }}-cgimap
+        run: {{ .Release.Name }}-cgimap-deployment
     spec:
       containers:
         - name: {{ .Chart.Name }}-cgimap

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

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-cgimap
+  name: {{ .Release.Name }}-cgimap-service
   labels:
     app: {{ template "osm-seed.name" . }}
     component: cgimap-service
@@ -33,5 +33,5 @@ spec:
   selector:
     app: {{ template "osm-seed.name" . }}
     release: {{ .Release.Name }}
-    run: {{ .Release.Name }}-cgimap
+    run: {{ .Release.Name }}-cgimap-deployment
 {{- end }}

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

@@ -154,10 +154,18 @@ spec:
               value: {{ .Values.web.env.RAILS_STORAGE_REGION | quote }}
             - name: RAILS_STORAGE_BUCKET
               value: {{ .Values.web.env.RAILS_STORAGE_BUCKET | quote }}
+            # Cgimap run in external container
+            {{- if and .Values.web.env.EXTERNAL .Values.cgimap.enabled }}
             - name: CGIMAP_URL
-              value: {{ .Release.Name }}-cgimap
+              value: {{ .Release.Name }}-cgimap-service
             - name: CGIMAP_PORT
               value: {{ quote 80 }}
+            {{- else }}
+            - name: CGIMAP_URL
+              value: "127.0.0.1"
+            - name: CGIMAP_PORT
+              value: {{ quote 8000 }}
+            {{- end }}
           volumeMounts:
             - mountPath: /dev/shm
               name: shared-memory

osm-seed/values.yaml

@@ -161,6 +161,7 @@ web:
     RAILS_STORAGE_SERVICE: local
     RAILS_STORAGE_REGION: us-east-1
     RAILS_STORAGE_BUCKET: osmseed-website-bucket
+    EXTERNAL_CGIMAP: false
   resources:
     enabled: false
     requests:
@@ -200,6 +201,23 @@ memcached:
       enabled: false
       memory: "2Gi"
       cpu: "2"
+
+# ====================================================================================================
+# Cgimap
+# ====================================================================================================
+cgimap:
+  enabled: false
+  priorityClass: "low-priority"
+  resources:
+    enabled: false
+    requests:
+      memory: '20Gi'
+      cpu: '8'
+    limits:
+      memory: '24Gi'
+      cpu: '10'
+  nodeSelector:
+    enabled: false
 # ====================================================================================================
 # Variables for full-history container
 # ====================================================================================================
@@ -1046,23 +1064,3 @@ planetFiles:
   image:
     name: ""
     tag: ""
-# ====================================================================================================
-# Cgimap
-# ====================================================================================================
-cgimap:
-  enabled: false
-  priorityClass: "low-priority"
-  image:
-    name: ''
-    tag: ''
-  resources:
-    enabled: false
-    requests:
-      memory: '20Gi'
-      cpu: '8'
-    limits:
-      memory: '24Gi'
-      cpu: '10'
-  nodeSelector:
-    enabled: false
-