Merge pull request #2826 from comicmuse/fix_openshift_deployments

Update and Fix Openshift Templates
huginn · Jul 14, 2020 · 6be22b5 · 6be22b5
2 parents 00826c3 + 281eb50
commit 6be22b5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -112,9 +112,9 @@ Huginn launches on the free version of Heroku [with significant limitations](htt
 
 ### OpenShift
 
-#### OpenShift v3
+#### OpenShift Online
 
-Try Huginn on OpenShift Online (v3)
+Try Huginn on OpenShift Online
 
 Create a new app with either `mysql` or `postgres`:
 ```bash
@@ -128,9 +128,7 @@ oc new-app -f https://raw.githubusercontent.com/huginn/huginn/master/openshift/t
 
 If you are on the Starter plan, make sure to follow the [guide](https://docs.openshift.com/online/getting_started/beyond_the_basics.html#btb-creating-a-new-application-from-source-code) to remove any existing application.
 
-##### OpenShift v4
-
-If you would like to run this on OpenShift v4+ you should look at the [Docker](https://github.com/huginn/huginn/blob/master/doc/docker/install.md) documentaition as your deployment process.
+The templates should work on a v3 installation or the current v4 online.
 
 ### Manual installation on any server
 

diff --git a/openshift/templates/huginn-mysql.json b/openshift/templates/huginn-mysql.json
@@ -96,13 +96,18 @@
                 },
                 "contextDir": "${CONTEXT_DIR}"
             },
+	    "resources":{
+	      "limits":{
+		"memory": "${BUILD_MEMORY_LIMIT}"
+	      }
+	    },
             "strategy": {
                 "type": "Source",
                 "sourceStrategy": {
                     "from": {
                         "kind": "ImageStreamTag",
                         "namespace": "${NAMESPACE}",
-                        "name": "ruby:4.5"
+                        "name": "ruby:2.5"
                     },
                     "env": [{
                         "name": "APP_SECRET_TOKEN",
@@ -591,14 +596,20 @@
         "name": "MEMORY_LIMIT",
         "displayName": "Memory Limit",
         "description": "Maximum amount of memory the Huginn container can use.",
-        "value": "512Mi",
+        "value": "1Gi",
         "required": true
     }, {
         "name": "MEMORY_MYSQL_LIMIT",
         "displayName": "Memory Limit (MySQL)",
         "description": "Maximum amount of memory the MySQL container can use.",
         "value": "512Mi",
         "required": true
+    }, {
+        "name": "BUILD_MEMORY_LIMIT",
+        "displayName": "Memory Limit",
+        "description": "Maximum amount of memory the Build container can use.",
+        "value": "1024Mi",
+        "required": true
     }, {
         "name": "VOLUME_CAPACITY",
         "displayName": "Volume Capacity",

diff --git a/openshift/templates/huginn-postgresql.json b/openshift/templates/huginn-postgresql.json
@@ -96,13 +96,18 @@
                 },
                 "contextDir": "${CONTEXT_DIR}"
             },
+	    "resources": {
+		"limits": {
+		   "memory": "${BUILD_MEMORY_LIMIT}"
+		}
+	    },
             "strategy": {
                 "type": "Source",
                 "sourceStrategy": {
                     "from": {
                         "kind": "ImageStreamTag",
                         "namespace": "${NAMESPACE}",
-                        "name": "ruby:4.5"
+                        "name": "ruby:2.5"
                     },
                     "env": [{
                         "name": "APP_SECRET_TOKEN",
@@ -379,7 +384,7 @@
                     "from": {
                         "kind": "ImageStreamTag",
                         "namespace": "${NAMESPACE}",
-                        "name": "postgresql:9.5"
+                        "name": "postgresql:9.6"
                     }
                 }
             }, {
@@ -591,14 +596,20 @@
         "name": "MEMORY_LIMIT",
         "displayName": "Memory Limit",
         "description": "Maximum amount of memory the Huginn container can use.",
-        "value": "512Mi",
+        "value": "1Gi",
         "required": true
     }, {
         "name": "MEMORY_POSTGRESQL_LIMIT",
         "displayName": "Memory Limit (PostgreSQL)",
         "description": "Maximum amount of memory the PostgreSQL container can use.",
         "value": "512Mi",
         "required": true
+    }, {
+        "name": "BUILD_MEMORY_LIMIT",
+        "displayName": "Memory Limit",
+        "description": "Maximum amount of memory the Huginn container can use.",
+        "value": "1Gi",
+        "required": true
     }, {
         "name": "VOLUME_CAPACITY",
         "displayName": "Volume Capacity",