Chg: update image tag in helm values to v2.4.2

Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>

helm/templates/_helpers.tpl

@@ -30,3 +30,13 @@ Create chart name and version as used by the chart label.
 {{- define "owgwui.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "owgwui.ingress.apiVersion" -}}
+  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
+      {{- print "networking.k8s.io/v1" -}}
+  {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
+    {{- print "networking.k8s.io/v1beta1" -}}
+  {{- else -}}
+    {{- print "extensions/v1beta1" -}}
+  {{- end -}}
+{{- end -}}

helm/templates/ingress.yaml

@@ -2,7 +2,7 @@
 {{- range $ingress, $ingressValue := .Values.ingresses }}
 {{- if $ingressValue.enabled }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "owgwui.ingress.apiVersion" $root }}
 kind: Ingress
 metadata:
   name: {{ include "owgwui.fullname" $root }}-{{ $ingress }}
@@ -36,9 +36,23 @@ spec:
       paths:
       {{- range $ingressValue.paths }}
         - path: {{ .path }}
+          {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+          pathType: {{ .pathType | default "ImplementationSpecific" }}
+          {{- end }}
           backend:
+            {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+            service:
+              name: {{ include "owgwui.fullname" $root }}-{{ .serviceName }}
+              port:
+              {{- if kindIs "string" .servicePort }}
+                name: {{ .servicePort }}
+              {{- else }}
+                number: {{ .servicePort }}
+              {{- end }}
+            {{- else }}
             serviceName: {{ include "owgwui.fullname" $root }}-{{ .serviceName }}
             servicePort: {{ .servicePort }}
+            {{- end }}
       {{- end }}
   {{- end }}
 

helm/values.yaml

@@ -7,7 +7,7 @@ fullnameOverride: ""
 images:
   owgwui:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw-ui
-    tag: v2.4.0-RC1
+    tag: v2.4.2
     pullPolicy: Always
 
 services:
@@ -48,6 +48,7 @@ ingresses:
     - chart-example.local
     paths:
     - path: /
+      pathType: ImplementationSpecific
       serviceName: owgwui
       servicePort: http
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.4.1",
+      "version": "2.4.3",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
@@ -32,7 +32,7 @@
         "react-tooltip": "^4.2.21",
         "react-widgets": "^5.1.1",
         "sass": "^1.35.1",
-        "ucentral-libs": "^1.0.31",
+        "ucentral-libs": "^1.0.37",
         "uuid": "^8.3.2"
       },
       "devDependencies": {
@@ -14842,9 +14842,9 @@
       }
     },
     "node_modules/ucentral-libs": {
-      "version": "1.0.31",
+      "version": "1.0.37",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.31.tgz",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.37.tgz",
-      "integrity": "sha512-lTMPHkzXpWJrPJPUG1L9KsNPMiJGgZLJmblhh22OFQBSbjnrT28ub0Xt8LjAdRaSEAId+MfnGwA6coGMvpg6pA==",
+      "integrity": "sha512-ALQobos6DIvXEydPotUixP7AZaDlUm2qUFkvR8F0EsdeSAW1UeYEg7Gp5r6RtxUqxp6DKpPCxOQ9bcqcl5556g==",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
@@ -27716,9 +27716,9 @@
       }
     },
     "ucentral-libs": {
-      "version": "1.0.31",
+      "version": "1.0.37",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.31.tgz",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.37.tgz",
-      "integrity": "sha512-lTMPHkzXpWJrPJPUG1L9KsNPMiJGgZLJmblhh22OFQBSbjnrT28ub0Xt8LjAdRaSEAId+MfnGwA6coGMvpg6pA==",
+      "integrity": "sha512-ALQobos6DIvXEydPotUixP7AZaDlUm2qUFkvR8F0EsdeSAW1UeYEg7Gp5r6RtxUqxp6DKpPCxOQ9bcqcl5556g==",
       "requires": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
@@ -26,7 +26,7 @@
     "react-tooltip": "^4.2.21",
     "react-widgets": "^5.1.1",
     "sass": "^1.35.1",
-    "ucentral-libs": "^1.0.31",
+    "ucentral-libs": "^1.0.37",
     "uuid": "^8.3.2"
   },
   "main": "index.js",

src/components/DeviceFirmwareModal/index.js

@@ -48,7 +48,7 @@ const DeviceFirmwareModal = ({
 
     const allFirmwares = [];
     let continueFirmware = true;
-    let i = 1;
+    let i = 0;
     while (continueFirmware) {
       const newFirmwares = await getPartialFirmware(i);
       if (newFirmwares === null || newFirmwares.length === 0) continueFirmware = false;

src/components/DeviceListTable/index.js

@@ -68,7 +68,7 @@ const DeviceList = () => {
     axiosInstance
       .get(
         `${endpoints.owgw}/api/v1/devices?deviceWithStatus=true&limit=${devicePerPage}&offset=${
-          devicePerPage * selectedPage + 1
+          devicePerPage * selectedPage
         }`,
         options,
       )

src/pages/FirmwareListPage/index.js

@@ -96,7 +96,7 @@ const FirmwareListPage = () => {
 
     const allFirmwares = [];
     let continueFirmware = true;
-    let i = 1;
+    let i = 0;
     while (continueFirmware) {
       const newFirmwares = await getPartialFirmware(deviceType ?? selectedDeviceType, i);
       if (newFirmwares === null || newFirmwares.length === 0) continueFirmware = false;