UI latest tests

.gitignore

@@ -1,3 +1,3 @@
-*.tgz
+# *.tgz
 *.lock
 **/temp/*

charts/frinx-arango-config/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: frinx-arango-config
-version: 3.0.0
+version: 3.1.0
 description: A Helm chart for Kubernetes deployment of the Arango CRD and ArangoDB configuration files
 type: application
 home: https://github.com/FRINXio/helm-charts

charts/frinx-arango-config/templates/arangodb-config.yaml

@@ -24,9 +24,15 @@ spec:
       {{- toYaml .Values.arangodb_config.securityContext | nindent 6 }}
     resources:
       {{- toYaml .Values.arangodb_config.resources | nindent 6 }}
+    {{- if .Values.arangodb_config.storageClassName }}
+    storageClassName: {{ .Values.arangodb_config.storageClassName }}
+    {{- end }}
   id:
     securityContext:
       {{- toYaml .Values.arangodb_config.securityContext | nindent 6 }}
     resources:
       {{- toYaml .Values.arangodb_config.resources | nindent 6 }}
+    {{- if .Values.arangodb_config.storageClassName }}
+    storageClassName: {{ .Values.arangodb_config.storageClassName }}
+  {{- end }}
 {{ end }}

charts/frinx-arango-config/values.yaml

@@ -11,6 +11,7 @@ arangodb_config:
   bearer: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJhcmFuZ29kYiIsInNlcnZlcl9pZCI6ImZvbyJ9.OxGlpYQYzOysECGkonaEP8d64UH1wQeo_XxeIqK8Vgg
   rootSecretName: arangodb-root-password
   rootSecretPassword: frinx
+  storageClassName:
   resources: {}
     # requests:
     #   cpu: 500m

charts/frinx-frontend/Chart.yaml

@@ -3,7 +3,7 @@ name: frinx-frontend
 description: A Helm chart for Kubernetes deployment of the Frinx UI
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 type: application
-version: 3.1.1
+version: 3.1.2
 appVersion: "1.0.28"
 maintainers:
   - name: FRINX

charts/frinx-frontend/values.yaml

@@ -86,7 +86,7 @@ env:
   UNICONFIG_API_DOCS_URL: "/api/workflow/docs-uniconfig"
   INVENTORY_ENABLED: true
   INVENTORY_API_URL: "/api/inventory"
-  INVENTORY_WS_URL: "/api/inventory/uniconfig"
+  INVENTORY_WS_URL: "ws://10.19.0.5:8001/api/inventory"
   RESOURCE_MANAGER_ENABLED: true
   RESOURCE_MANAGER_API_URL: "/api/resource"
   UNISTORE_API_URL: "/api/unistore"

charts/frinx-machine/Chart.yaml

@@ -9,13 +9,15 @@ maintainers:
 dependencies:
   - condition: krakend.enabled
     name: krakend
-    repository: https://FRINXio.github.io/helm-charts
-    version: 2.9.1
+    # repository: https://FRINXio.github.io/helm-charts
+    repository: "file://../krakend"
+    version: 2.9.2
 
   - condition: frinx-frontend.enabled
     name: frinx-frontend
-    repository: https://FRINXio.github.io/helm-charts
-    version: 3.1.1
+    # repository: https://FRINXio.github.io/helm-charts
+    repository: "file://../frinx-frontend"
+    version: 3.1.2
 
   - condition: postgresql.enabled
     name: postgresql
@@ -29,13 +31,15 @@ dependencies:
 
   - condition: workflow-manager.enabled
     name: workflow-manager
-    repository: https://FRINXio.github.io/helm-charts
-    version: 2.0.0
+    # repository: https://FRINXio.github.io/helm-charts
+    repository: "file://../workflow-manager"
+    version: 3.0.0
 
   - condition: inventory.enabled
     name: inventory
-    repository: https://FRINXio.github.io/helm-charts
-    version: 4.0.0
+    # repository: https://FRINXio.github.io/helm-charts
+    repository: "file://../inventory"
+    version: 4.0.1
 
   - condition: uniconfig-postgresql.enabled
     name: postgresql
@@ -45,8 +49,9 @@ dependencies:
 
   - condition: uniconfig.enabled
     name: uniconfig
-    repository: https://FRINXio.github.io/helm-charts
-    version: 5.0.1
+    # repository: https://FRINXio.github.io/helm-charts
+    repository: "file://../uniconfig"
+    version: 5.1.0
 
   - condition: demo-workflows.enabled
     name: demo-workflows
@@ -65,8 +70,9 @@ dependencies:
 
   - condition: frinx-arango-config.enabled
     name: frinx-arango-config
-    repository: https://FRINXio.github.io/helm-charts
-    version: 3.0.0
+    # repository: https://FRINXio.github.io/helm-charts
+    repository: "file://../frinx-arango-config"
+    version: 3.1.0
 
   - condition: topology-discovery.enabled
     name: topology-discovery

charts/frinx-machine/e2e-values.yaml

@@ -35,7 +35,7 @@ inventory:
       memory: 500Mi
       cpu: 500m
   env:
-    TOPOLOGY_ENABLED: true
+    # TOPOLOGY_ENABLED: true
 
 uniconfig-postgresql:
   primary:
@@ -76,12 +76,12 @@ loki:
   enabled: false
 
 topology-discovery:
-  enabled: true
+  enabled: false
   env:
     IMPORT_ARANGO_DEMO_DATA: true
 
 frinx-arango-config:
-  enabled: true
+  enabled: false
   arangodb_config:
     enabled: true
     resources:

charts/frinx-machine/proxmox-values.yaml

@@ -0,0 +1,50 @@
+krakend:
+  service:
+    type: LoadBalancer
+
+postgresql:
+  global:
+    storageClass: longhorn
+
+uniconfig:
+  service:
+    type: LoadBalancer
+
+uniconfig-postgresql:
+  global:
+    storageClass: longhorn
+
+inventory:
+  env:
+    TOPOLOGY_ENABLED: true
+
+topology-discovery:
+  enabled: true
+  env:
+    IMPORT_ARANGO_DEMO_DATA: true
+    IMPORT_DEVICE_INVENTORY_DATA: true
+
+frinx-arango-config:
+  enabled: true
+  arangodb_config:
+    enabled: true
+    storageClassName: longhorn
+
+demo-workflows:
+  enabled: true
+
+sample-topology:
+  enabled: true
+
+influxdb2:
+  persistence:
+    storageClass: longhorn
+
+telegraf-ds:
+  rbac:
+    create: false
+
+grafana:
+  service:
+    type: LoadBalancer
+    port: 3000

charts/frinx-machine/values.yaml

@@ -10,13 +10,19 @@ krakend:
   image:
     repository: "frinx/krakend"
     tag: "1.0.6"
+  deployment:
+    env:
+      UNICONFIG_SHELL_ENABLED: true
+      UNICONFIG_SHELL_OAUTH_ENABLED: true
+      OAUTH2_AUTH_URL: true
 
 frinx-frontend:
   enabled: true
   fullnameOverride: "frinx-frontend"
   image:
     repository: "frinx/frinx-frontend"
-    tag: "1.0.53"
+    pullPolicy: Always
+    tag: "2.0.0"
   env:
     AUTH_CLIENT_ID: "frinx"
     DEVICE_TOPOLOGY_ENABLED: true
@@ -43,12 +49,16 @@ resource-manager:
   fullnameOverride: "resource-manager"
   image:
     repository: "frinx/resource-manager"
-    tag: "1.0.10"
+    tag: "latest"
+    pullPolicy: Always
   postgresql:
     enabled: false
   env:
     PSQL_HOSTNAME: frinx-postgresql
     RM_DB_CONNECTION_STRING: "postgres://postgresU:postgresP@frinx-postgresql:5432/postgres?sslmode=disable"
+    RM_LOG_LEVEL: debug
+  # extraEnv:
+  #   DEBUG: true
 
 workflow-manager:
   enabled: true
@@ -61,7 +71,7 @@ workflow-manager:
     tag: "2.1.5"
   schellarImage:
     repository: "frinx/schellar"
-    tag: "3.0.0"
+    tag: "4.0.0"
   postgresql:
     enabled: false
   conductorEnv:
@@ -76,7 +86,8 @@ inventory:
   fullnameOverride: "inventory"
   image:
     repository: "frinx/frinx-inventory-server"
-    tag: "1.9.3"
+    pullPolicy: Always
+    tag: "2.0.1"
   postgresql:
     enabled: false
   env:
@@ -88,7 +99,7 @@ topology-discovery:
   fullnameOverride: "topology-discovery"
   image:
     repository: "frinx/topology-discovery"
-    tag: "0.0.11"
+    tag: "1.0.0"
 
 frinx-arango-config:
   enabled: *device-discovery-enabled
@@ -126,7 +137,7 @@ uniconfig:
   enabled: true
   image:
     repository: "frinx/uniconfig"
-    tag: "5.1.9"
+    tag: "5.1.11"
   imagePullSecrets:
     - name: regcred
   postgresql:
@@ -141,9 +152,9 @@ uniconfig:
   securityContext:
     capabilities:
       add:
-      - NET_BIND_SERVICE
+        - NET_BIND_SERVICE
       drop:
-      - ALL
+        - ALL
 
 demo-workflows:
   enabled: false

charts/inventory/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: inventory
-version: 4.0.0
+version: 4.0.1
 description: A Helm chart for Kubernetes deployment of the Device Inventory
 type: application
 home: https://github.com/FRINXio/helm-charts

charts/inventory/templates/deployment.yaml

@@ -85,8 +85,16 @@ spec:
               value: {{ .Values.env.TOPOLOGY_ENABLED | quote }}
             - name: "TOPOLOGY_DISCOVERY_API_URL"
               value: {{ .Values.env.TOPOLOGY_DISCOVERY_API_URL | quote }}
+            - name: "TOPOLOGY_DISCOVERY_GRAPHQL_API_URL"
+              value: {{ .Values.env.TOPOLOGY_DISCOVERY_GRAPHQL_API_URL | quote }}
             - name: "SHELL_HOST"
               value: {{ .Values.env.SHELL_HOST | quote }}
+            - name: "CONDUCTOR_API_URL"
+              value: {{ .Values.env.CONDUCTOR_API_URL | quote }}
+            - name: "SCHEDULER_API_URL"
+              value: {{ .Values.env.SCHEDULER_API_URL | quote }}
+            - name: "RESOURCE_MANAGER_API_URL"
+              value: {{ .Values.env.RESOURCE_MANAGER_API_URL | quote }}
           {{- range $key, $val := .Values.extraEnv }}
             - name: {{ $key | quote }}
               value: {{ $val | quote }}

charts/inventory/values.yaml

@@ -93,7 +93,11 @@ env:
   POSTGRES_PORT: 5432
   TOPOLOGY_ENABLED: false
   TOPOLOGY_DISCOVERY_API_URL: http://topology-discovery:5000/api/data
+  TOPOLOGY_DISCOVERY_GRAPHQL_API_URL: http://topology-discovery:5000/api/graphql
   SHELL_HOST: uniconfig-controller
+  CONDUCTOR_API_URL: "http://workflow-proxy:8080/api"
+  SCHEDULER_API_URL: "http://workflow-proxy:3000/query"
+  RESOURCE_MANAGER_API_URL: "http://krakend:8080/api/resource"
 
 extraEnv: []
 

charts/krakend/Chart.yaml

@@ -3,7 +3,7 @@ name: krakend
 description: FRINX KrakenD API Gateway for FRINX-machine
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 type: application
-version: 2.9.1
+version: 2.9.2
 appVersion: "1.0.5"
 maintainers:
   - name: FRINX

charts/krakend/config/krakend.json

@@ -17,6 +17,28 @@
     "folder": "/usr/local/lib/krakend/"
   },
   "extra_config": {
+    {{ $uc_shell := env "UNICONFIG_SHELL_ENABLED" }}
+    {{ if eq $uc_shell "true" }}
+    "contribute/websocketproxy": {
+      "port": "8001",
+      "websockets": [
+        {
+          {{ $uc_shell := env "UNICONFIG_SHELL_OAUTH_ENABLED" }}
+          {{ if eq $uc_shell "true" }}
+          {{ $uc_shell_oauth_url := env "OAUTH2_AUTH_URL" }}
+          {{ $uc_shell_bearer := env "AZURE_KRAKEND_PLUGIN_JWT_VALUE_PREFIX" }}
+          {{ $uc_shell_rbac := env "UNICONFIG_CONTROLLER_ADMIN_GROUP" }}
+          "@comment": "uncomment and replace '",
+          "@comment": "jwk_url':' {{ $uc_shell_oauth_url }}",
+          "@comment": "rbac_roles':' {{ $uc_shell_rbac }}",
+          "@comment": "jwk_url ':' {{ $uc_shell_oauth_url }}",
+          {{end}}
+          "backend": "ws://inventory:8000/graphql",
+          "endpoint": "/api/inventory"
+        }
+      ]
+    },
+    {{end}}
     "router":{
       "disable_path_decoding" : true,
       "disable_redirect_fixed_path": true,

charts/krakend/templates/service.yaml

@@ -11,5 +11,9 @@ spec:
       targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
       name: http
+    - port: 8001
+      targetPort: 8001
+      protocol: TCP
+      name: websocket
   selector:
     {{- include "krakend.selectorLabels" . | nindent 4 }}

charts/krakend/values.yaml

@@ -100,6 +100,10 @@
     RESOURCE_MANAGER_ENABLED: true
     L3VPN_ENABLED: false
     DEVICE_TOPOLOGY_ENABLED: false
+    UNICONFIG_SHELL_ENABLED: false
+    UNICONFIG_SHELL_OAUTH_ENABLED: false
+    OAUTH2_AUTH_URL: false
+
   azureAuth:
     enabled: false
     AZURE_LOGIN_URL: "https://login.microsoftonline.com"

charts/uniconfig/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: uniconfig
-version: 5.0.1
+version: 5.1.0
 description: A Helm chart for UniConfig Kubernetes deployment
 type: application
 home: https://github.com/FRINXio/helm-charts

charts/uniconfig/templates/deployment.yaml

@@ -161,6 +161,9 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+            - name: cli-shell
+              containerPort: 2022
+              protocol: TCP
           livenessProbe:
             exec:
               command: