Chg: update image tag in helm values to v2.5.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,11 +36,25 @@ 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 }}
 
 {{- end }}
 

helm/values.yaml

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

src/components/WifiAnalysis/WifiAnalysis.js

@@ -23,7 +23,7 @@ const WifiAnalysisTable = ({ t, data, loading }) => {
   };
   const columns = [
     { key: 'radio', label: '#', _style: { width: '1%' } },
-    { key: 'bssid', label: 'BSSID', _style: { width: '1%' } },
+    { key: 'station', label: 'Station ID', _style: { width: '1%' } },
     { key: 'vendor', label: t('wifi_analysis.vendor'), _style: { width: '15%' }, sorter: false },
     { key: 'mode', label: t('wifi_analysis.mode'), _style: { width: '1%' }, sorter: false },
     { key: 'ssid', label: 'SSID', _style: { width: '15%' } },
@@ -84,12 +84,12 @@ const WifiAnalysisTable = ({ t, data, loading }) => {
         sorter
         sorterValue={{ column: 'radio', asc: true }}
         scopedSlots={{
-          bssid: (item) => (
+          station: (item) => (
             <td
               className="text-center align-middle"
               style={{ fontFamily: 'monospace', fontSize: '0.96rem' }}
             >
-              {item.bssid}
+              {item.station}
             </td>
           ),
           radio: (item) => <td className="text-center align-middle">{item.radio.radio}</td>,

src/components/WifiAnalysis/index.js

@@ -147,12 +147,12 @@ const WifiAnalysis = () => {
 
             if ('associations' in ssid) {
               for (const association of ssid.associations) {
-                bssidObj[association.bssid] = 0;
+                bssidObj[association.station] = 0;
 
                 const data = {
                   radio: radioInfo,
                   ...extractIp(stat.data, association.bssid),
-                  bssid: association.bssid,
+                  station: association.station,
                   ssid: ssid.ssid,
                   rssi: association.rssi ? parseDbm(association.rssi) : '-',
                   mode: ssid.mode,
@@ -181,7 +181,7 @@ const WifiAnalysis = () => {
     for (let i = 0; i < newParsedAssociationStats.length; i += 1) {
       for (let y = 0; y < newParsedAssociationStats[i].length; y += 1) {
         newParsedAssociationStats[i][y].vendor =
-          vendors[newParsedAssociationStats[i][y].bssid] ?? '-';
+          vendors[newParsedAssociationStats[i][y].station] ?? '-';
       }
     }