Bump uniconfig and update uniconfig config files

FRINXio · Jul 15, 2022 · eece4a8 · eece4a8
1 parent d11c853
commit eece4a8
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 18 deletions.
diff --git a/composefiles/support/swarm-monitoring.yml b/composefiles/support/swarm-monitoring.yml
@@ -7,6 +7,7 @@ x-logging: &logging_loki
       max-file: "3"
       max-size: "10m"
       mode: non-blocking
+      keep-file: "true"
       loki-retries: "1"
       loki-batch-size: "1500"
       loki-relabel-config: |

diff --git a/composefiles/swarm-uniconfig.yml b/composefiles/swarm-uniconfig.yml
@@ -12,6 +12,7 @@ x-logging: &logging_loki
       max-file: "3"
       max-size: "10m"
       mode: non-blocking
+      keep-file: "true"
       loki-retries: "1"
       loki-batch-size: "1500"
       loki-relabel-config: |
@@ -83,7 +84,7 @@ services:
           memory: ${TF_RES_LIMIT_MEM}
 
   uniconfig-controller:
-    image: frinx/uniconfig:5.0.9
+    image: frinx/uniconfig:5.0.11
     logging: *logging_loki
     networks:
       - uniconfig-network

diff --git a/composefiles/swarm-uniflow.yml b/composefiles/swarm-uniflow.yml
@@ -8,6 +8,7 @@ x-logging: &logging_loki
       max-file: "3"
       max-size: "10m"
       mode: non-blocking
+      keep-file: "true"
       loki-retries: "1"
       loki-batch-size: "1500"
       loki-relabel-config: |
@@ -16,7 +17,7 @@ x-logging: &logging_loki
 
 services:
   krakend:
-    image: frinx/krakend:latest
+    image: frinx/krakend:1.0.4
     # user: root
     logging: *logging_loki
     labels:
@@ -89,7 +90,7 @@ services:
           memory: ${KD_RES_LIMIT_MEM}
 
   conductor-server:
-    image: frinx/uniflow-conductor-server:1.0.7
+    image: frinx/uniflow-conductor-server:1.0.8
     # user: guest
     logging: *logging_loki
     labels:
@@ -189,7 +190,7 @@ services:
           memory: ${ES_RES_LIMIT_MEM}
 
   frinx-frontend:
-    image: frinx/frinx-frontend:latest
+    image: frinx/frinx-frontend:1.0.10
     user: node
     logging: *logging_loki
     labels:
@@ -341,7 +342,7 @@ services:
           memory: ${SC_RES_LIMIT_MEM}
 
   workflow-proxy:
-    image: frinx/workflow-proxy:latest
+    image: frinx/workflow-proxy:1.0.9
     user: node
     logging: *logging_loki
     labels:
@@ -388,7 +389,7 @@ services:
           memory: ${WP_RES_LIMIT_MEM}
 
   uniresource:
-    image: frinx/resource-manager:1.0.4
+    image: frinx/resource-manager:1.0.5
     logging: *logging_loki
     labels:
       - traefik.enable=false
@@ -435,7 +436,7 @@ services:
           memory: ${UR_RES_LIMIT_MEM}
 
   inventory:
-    image: frinx/frinx-inventory-server:latest
+    image: frinx/frinx-inventory-server:1.3.0
     logging: *logging_loki
     labels:
       - traefik.enable=false
@@ -459,7 +460,6 @@ services:
       timeout: 5s
       retries: 5
       start_period: 40s
-    entrypoint: ["/run_inventory.sh"]
     ulimits:
       nofile:
         soft: ${IV_ULIMIT_NOFILE_SOFT}

diff --git a/composefiles/swarm-unistore.yml b/composefiles/swarm-unistore.yml
@@ -12,6 +12,7 @@ x-logging: &logging_loki
       max-file: "3"
       max-size: "10m"
       mode: non-blocking
+      keep-file: "true"
       loki-retries: "1"
       loki-batch-size: "1500"
       loki-relabel-config: |
@@ -28,7 +29,7 @@ x-tcp_keepalive: &tcp_keepalive
 
 services:
   unistore:
-    image: frinx/uniconfig:5.0.9
+    image: frinx/uniconfig:5.0.11
     logging: *logging_loki
     labels:
       - traefik.enable=false  

diff --git a/config/krakend/settings/workflow_proxy_settings.json b/config/krakend/settings/workflow_proxy_settings.json
@@ -104,11 +104,6 @@
             "method": "GET",
             "url_pattern": "/schedule"
         },
-        {
-            "endpoint": "/api/uniflow/schedule",
-            "method": "POST",
-            "url_pattern": "/schedule"
-        },
         {
             "endpoint": "/api/uniflow/schedule/{name}",
             "method": "GET",

diff --git a/config/krakend/templates/inventory.tmpl b/config/krakend/templates/inventory.tmpl
@@ -1,6 +1,7 @@
 {
     "endpoint": "/api/inventory",
     "method": "POST",
+    "output_encoding": "no-op",
     "input_headers": [ {{ include "allowed_headers.tmpl" }} ],
 
     "extra_config": {
@@ -16,6 +17,7 @@
         {
             "url_pattern": "/graphql",
             "sd": "static",
+            "encoding": "no-op",
             "disable_host_sanitize": false,
             "extra_config": {
                 {{ include "modifiers.tmpl" }}

diff --git a/config/krakend/templates/uniresource.tmpl b/config/krakend/templates/uniresource.tmpl
@@ -3,6 +3,7 @@
 {
     "endpoint": "{{ .endpoint }}",
     "method": "{{ .method }}",
+    "output_encoding": "no-op",
     "input_headers": [ {{ include "allowed_headers.tmpl" }} ],
 
     {{ if .input_query_strings }}
@@ -23,6 +24,7 @@
     "backend": [
     {
         "url_pattern": "{{ .url_pattern }}",
+        "encoding": "no-op",
         "extra_config": {
             {{ include "modifiers.tmpl" }}
         },

diff --git a/config/uniconfig/frinx/uniconfig/config/lighty-uniconfig-config.json b/config/uniconfig/frinx/uniconfig/config/lighty-uniconfig-config.json
@@ -58,6 +58,9 @@
         // delimiter used for escaping of list keys in URI (for example, '%22')
         // if it is set to 'null' (default), keys cannot be escaped and must be directly encoded according to RFC-8040
         "keyDelimiter": null,
+        // Flag that determines if the data node that is empty(means node contains only attribute tag) should be hidden
+        // during GET operation.
+        "hideEmptyDataNodes": false,
         // Settings related to filtering of data in CRUD operations.
         "schemaFilters": {
             // List of extension definitions that can be used to filter out data during PUT/POST/PATCH operation.
@@ -73,7 +76,14 @@
             "ignoreUnsupportedDefinitionsOnWrite": false,
             // Indicates if the definition with "DEPRECATED" status should be hidden during GET operation.
             "hideDeprecatedDefinitionsOnRead": false
-        }
+        },
+        // default value 0 makes the behavior as defined in RFC8040 (returns status code 404 [Not Found]),
+        // if changed to anything else, that status code will be returned
+        "statusCodeForEmptyGetResponse": 0,
+        // this flag removes namespaces from GET response (only if there are no duplicate localnames)
+        // (E.g. if there is: namespace1:test and namespace2:test  .. the namespace won't be removed because
+        // there would be two identical localnames)
+        "showNamespaceInJsonResponse": true
     },
     /*
     CLI shell settings via environment variables.

diff --git a/config/unistore/lighty-unistore-config.json b/config/unistore/lighty-unistore-config.json
@@ -58,6 +58,9 @@
         // delimiter used for escaping of list keys in URI (for example, '%22')
         // if it is set to 'null' (default), keys cannot be escaped and must be directly encoded according to RFC-8040
         "keyDelimiter": null,
+        // Flag that determines if the data node that is empty(means node contains only attribute tag) should be hidden
+        // during GET operation.
+        "hideEmptyDataNodes": false,
         // Settings related to filtering of data in CRUD operations.
         "schemaFilters": {
             // List of extension definitions that can be used to filter out data during PUT/POST/PATCH operation.
@@ -73,7 +76,14 @@
             "ignoreUnsupportedDefinitionsOnWrite": false,
             // Indicates if the definition with "DEPRECATED" status should be hidden during GET operation.
             "hideDeprecatedDefinitionsOnRead": false
-        }
+        },
+        // default value 0 makes the behavior as defined in RFC8040 (returns status code 404 [Not Found]),
+        // if changed to anything else, that status code will be returned
+        "statusCodeForEmptyGetResponse": 0,
+        // this flag removes namespaces from GET response (only if there are no duplicate localnames)
+        // (E.g. if there is: namespace1:test and namespace2:test  .. the namespace won't be removed because
+        // there would be two identical localnames)
+        "showNamespaceInJsonResponse": true
     },
     /*
     CLI shell settings via environment variables.

diff --git a/teardown.sh b/teardown.sh
@@ -69,8 +69,8 @@ function unused_monitoring_volumes()
 
 function unused_fm_volumes()
 {
-    local __volumes=$(docker volume ls -q -f name=frinx_uniflow* -f name=uniconfig-controller_logs -f name=-postgresql_data -f name=frinx_unistore_* )
-    local __unused_volumes=$(docker volume ls -q -f name=frinx_uniflow* -f name=uniconfig-controller_logs -f name=-postgresql_data -f name=frinx_unistore_* -f dangling=true)
+    local __volumes=$(docker volume ls -q -f name=frinx_* )
+    local __unused_volumes=$(docker volume ls -q -f name=frinx_* -f dangling=true)
 
     if [ "${__volumes[@]}" != "" ]; then
         if [ "${__volumes[@]}" == "${__unused_volumes[@]}" ]; then