[extensions-web] openshift: use ConfigMap instead of direct variables



commit f04f85df99fcb4cdce3ce3601c84159285df08a2
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Sat Dec 15 11:29:46 2018 +0400

    openshift: use ConfigMap instead of direct variables

 openshift/templates/extensions-web-nginx.json | 52 ++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 13 deletions(-)
---
diff --git a/openshift/templates/extensions-web-nginx.json b/openshift/templates/extensions-web-nginx.json
index 335b402..695f949 100644
--- a/openshift/templates/extensions-web-nginx.json
+++ b/openshift/templates/extensions-web-nginx.json
@@ -28,8 +28,10 @@
         "name": "${NAME}"
       },
       "data": {
+        "allowed-host": "${APPLICATION_DOMAIN}",
         "media-root": "/extensions-web/www/uploaded-files",
-        "static-root": "/extensions-web/www/static-files"
+        "static-root": "/extensions-web/www/static-files",
+        "xapian-db": "/extensions-web/data/xapian.db"
       }
     },
     {
@@ -377,11 +379,21 @@
                   },
                   {
                     "name": "EGO_ALLOWED_HOST",
-                    "value": "${APPLICATION_DOMAIN}"
+                    "valueFrom": {
+                        "configMapKeyRef": {
+                            "name": "${NAME}",
+                            "key": "allowed-host"
+                        }
+                    }
                   },
                   {
                     "name": "EGO_XAPIAN_DB",
-                    "value": "${EGO_XAPIAN_DB}"
+                    "valueFrom": {
+                        "configMapKeyRef": {
+                            "name": "${NAME}",
+                            "key": "xapian-db"
+                        }
+                    }
                   }
                 ],
                 "volumeMounts": [
@@ -502,11 +514,21 @@
                       },
                       {
                         "name": "EGO_ALLOWED_HOST",
-                        "value": "${APPLICATION_DOMAIN}"
+                        "valueFrom": {
+                          "configMapKeyRef": {
+                            "name": "${NAME}",
+                            "key": "allowed-host"
+                          }
+                        }
                       },
                       {
                         "name": "EGO_XAPIAN_DB",
-                        "value": "${EGO_XAPIAN_DB}"
+                        "valueFrom": {
+                          "configMapKeyRef": {
+                            "name": "${NAME}",
+                            "key": "xapian-db"
+                          }
+                        }
                       }
                     ]
                   }
@@ -582,11 +604,21 @@
                       },
                       {
                         "name": "EGO_ALLOWED_HOST",
-                        "value": "${APPLICATION_DOMAIN}"
+                        "valueFrom": {
+                          "configMapKeyRef": {
+                            "name": "${NAME}",
+                            "key": "allowed-host"
+                          }
+                        }
                       },
                       {
                         "name": "EGO_XAPIAN_DB",
-                        "value": "${EGO_XAPIAN_DB}"
+                        "valueFrom": {
+                          "configMapKeyRef": {
+                            "name": "${NAME}",
+                            "key": "xapian-db"
+                          }
+                        }
                       }
                     ],
                     "volumeMounts": [
@@ -669,12 +701,6 @@
       "description": "Django secret key.",
       "value": ""
     },
-    {
-      "name": "EGO_XAPIAN_DB",
-      "displayName": "Xapian database path",
-      "description": "Path to Xapian database.",
-      "value": ""
-    },
     {
       "name": "WEBHOOK_SECRET_KEY",
       "displayName": "WebHook secret key",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]