Fix issues with postgresql template

Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Mar 26, 2024 · bffaeb3 · bffaeb3
1 parent 538be0b
commit bffaeb3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/openshift/templates/nodejs-postgresql-persistent.json b/openshift/templates/nodejs-postgresql-persistent.json
@@ -10,7 +10,7 @@
       "iconClass": "icon-nodejs",
       "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration.",
       "openshift.io/provider-display-name": "Red Hat, Inc.",
-      "openshift.io/documentation-url": "https://github.com/nodeshift-starters/nodejs-rest-http-crud",
+      "openshift.io/documentation-url": "https://github.com/sclorg/nodejs-ex",
       "openshift.io/support-url": "https://access.redhat.com",
       "template.openshift.io/bindable": "false"
     }
@@ -60,7 +60,10 @@
       "kind": "Route",
       "apiVersion": "route.openshift.io/v1",
       "metadata": {
-        "name": "${NAME}"
+        "name": "${NAME}",
+        "annotations": {
+          "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}"
+        }
       },
       "spec": {
         "host": "${APPLICATION_DOMAIN}",
@@ -179,7 +182,7 @@
           "spec": {
             "containers": [
               {
-                "name": "nodejs-postgresql-persistent",
+                "name": "${NAME}",
                 "image": " ",
                 "ports": [
                   {
@@ -448,7 +451,7 @@
       "displayName": "Git Repository URL",
       "description": "The URL of the repository with your application source code.",
       "required": true,
-      "value": "https://github.com/nodeshift-starters/nodejs-rest-http-crud.git"
+      "value": "https://github.com/sclorg/nodejs-ex.git"
     },
     {
       "name": "SOURCE_REPOSITORY_REF",

diff --git a/tests/test_nodejs_postgresql.py b/tests/test_nodejs_postgresql.py
@@ -11,7 +11,7 @@
 if not VERSION:
     VERSION="20-ubi8"
 
-class TestNodeJSAppExTemplate:
+class TestNodeJSAppPostgreSQLExTemplate:
 
     def setup_method(self):
         self.oc_api = OpenShiftAPI(pod_name_prefix="nodejs-example")
@@ -27,7 +27,25 @@ def setup_method(self):
     def teardown_method(self):
         self.oc_api.delete_project()
 
-    def test_template_inside_cluster(self):
+    def test_local_template_inside_cluster(self):
+        expected_output = "Node.js Crud Application"
+        template_json = "../openshift/templates/nodejs-postgresql-persistent.json"
+        assert self.oc_api.deploy_template(
+            template=template_json, name_in_template="nodejs-example", expected_output=expected_output,
+            openshift_args=[
+                "SOURCE_REPOSITORY_REF=master",
+                f"NODEJS_VERSION={VERSION}",
+                "NAME=nodejs-example",
+                "POSTGRESQL_VERSION=12-el8"
+            ]
+        )
+        assert self.oc_api.template_deployed(name_in_template="nodejs-example")
+        assert self.oc_api.check_response_inside_cluster(
+            name_in_template="nodejs-example", expected_output=expected_output
+        )
+
+
+    def test_remote_template_inside_cluster(self):
         expected_output = "Node.js Crud Application"
         template_json = self.oc_api.get_raw_url_for_json(
             container="nodejs-ex", dir="openshift/templates", filename="nodejs-postgresql-persistent.json"
@@ -46,7 +64,7 @@ def test_template_inside_cluster(self):
             name_in_template="nodejs-example", expected_output=expected_output
         )
 
-    def test_template_by_request(self):
+    def test_remote_template_by_request(self):
         expected_output = "Node.js Crud Application"
         template_json = self.oc_api.get_raw_url_for_json(
             container="nodejs-ex", dir="openshift/templates", filename="nodejs-postgresql-persistent.json"