From 9bbbb6837b27d80a50e27fce1e93e8ea9d8eb8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Vol=C3=A1k?= Date: Wed, 10 Jul 2024 13:10:09 +0200 Subject: [PATCH] [frinx-frontend] Bump image versions to 6.1 and add/remove env variables (#393) Co-authored-by: Jozef Volak --- charts/frinx-frontend/Chart.yaml | 14 +++++++------- charts/frinx-frontend/README.md | 25 +++++++++++-------------- charts/frinx-frontend/values.yaml | 31 +++++++++++++++---------------- 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/charts/frinx-frontend/Chart.yaml b/charts/frinx-frontend/Chart.yaml index 28ddc6b7..7d7a13f8 100644 --- a/charts/frinx-frontend/Chart.yaml +++ b/charts/frinx-frontend/Chart.yaml @@ -3,19 +3,19 @@ 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: 4.0.1 -appVersion: "6.0.0" +version: 4.1.0 +appVersion: "6.1.0" maintainers: - name: FRINX annotations: artifacthub.io/images: | - name: frinx-frontend - image: frinx/frinx-frontend:6.0.0 + image: frinx/frinx-frontend:6.1.0 - name: frinx-graphql-proxy - image: frinx/frinx-graphql-proxy:6.0.0 + image: frinx/frinx-graphql-proxy:6.1.0 artifacthub.io/changes: | - - kind: fixed - description: Increased initialDelaySeconds for graphql-proxy liveness and readiness container + - kind: changed + description: Environment variables compatible with release 6.1 links: - name: GitHub PR - url: https://github.com/FRINXio/helm-charts/pull/369 + url: https://github.com/FRINXio/helm-charts/pull/393 diff --git a/charts/frinx-frontend/README.md b/charts/frinx-frontend/README.md index 3e4923eb..32e77017 100644 --- a/charts/frinx-frontend/README.md +++ b/charts/frinx-frontend/README.md @@ -62,26 +62,23 @@ helm uninstall [RELEASE_NAME] | `nodeSelector` | Node labels for pod assignment | `{}` | | `tolerations` | Toleration labels for pod assignment | `[]` | | `affinity` | Affinity settings for pod assignment | `{}` | -| `env.AUTH_REDIRECT_SCHEME` | AUTH_REDIRECT_SCHEME env variable | `"http"` | | `env.AUTH_ENABLED` | AUTH_ENABLED env variable | `false` | +| `env.PERFORMANCE_MONITORING_ENABLED` | PERFORMANCE_MONITORING_ENABLED env variable | `false` | | `env.URL_BASENAME` | URL_BASENAME env variable | `"/frinxui"` | -| `env.WORKFLOW_MANAGER_ENABLED` | WORKFLOW_MANAGER_ENABLED env variable | `true` | | `env.WORKFLOW_MANAGER_API_URL` | CONDUCTOR_API_URL env variable | `"/api/workflow"` | -| `env.WORKFLOW_MANAGER_API_DOCS_URL` | WORKFLOW_MANAGER_API_DOCS_URLgitk env variable | `"/api/workflow/docs"` | -| `env.UNICONFIG_ENABLED` | UNICONFIG_ENABLED env variable | `true` | -| `env.UNICONFIG_API_DOCS_URL` | UNICONFIG_API_DOCS_URL env variable | `"/api/workflow/docs-uniconfig"` | -| `env.INVENTORY_ENABLED` | INVENTORY_ENABLED env variable | `true` | -| `env.INVENTORY_API_URL` | INVENTORY_API_URL env variable | `"/api/proxy"` | -| `env.RESOURCE_MANAGER_ENABLED` | RESOURCE_MANAGER_ENABLED env variable | `true` | | `env.RESOURCE_MANAGER_API_URL` | RESOURCE_MANAGER_API_URL env variable | `"/api/proxy"` | | `env.UNISTORE_API_URL` | UNISTORE_API_URL env variable | `"/api/unistore"` | -| `env.L3VPN_ENABLED` | L3VPN_ENABLED env variable | `false` | -| `env.AUTH_CLIENT_ID` | AUTH_CLIENT_ID env variable | `"frinx"` | -| `env.AUTH_REDIRECT_DOMAIN` | AUTH_REDIRECT_DOMAIN env variable | `localhost` | -| `env.MSAL_AUTHORITY` | MSAL_AUTHORITY env variable | `https://login.microsoftonline.com/common/` | -| `env.DEVICE_TOPOLOGY_ENABLED` | DEVICE_TOPOLOGY_ENABLED env variable | `false` | - +| `env.INVENTORY_API_URL` | INVENTORY_API_URL env variable | `"/api/proxy"` | +| `env.INVENTORY_WS_PATH` | INVENTORY_WS_PATH env variable | `"/api/proxy"` | +| `env.INVENTORY_WS_SCHEMA` | INVENTORY_WS_SCHEMA env variable | `"wss://"` | +| `env.UNICONFIG_API_DOCS_URL` | UNICONFIG_API_DOCS_URL env variable | `"/api/workflow/docs-uniconfig"` | +| `env.WORKFLOW_MANAGER_API_DOCS_URL` | WORKFLOW_MANAGER_API_DOCS_URLgitk env variable | `"/api/workflow/docs"` | +| `env.RESOURCE_MANAGER_API_DOCS_URL` | RESOURCE_MANAGER_API_DOCS_URL env variable | `"/api/resource"` | +| `env.SCHELLAR_API_DOCS_URL` | SCHELLAR_API_DOCS_URL env variable | `"/api/schedule"` | +| `env.PERFORMANCE_MONITOR_API_DOCS_URL` | PERFORMANCE_MONITOR_API_DOCS_URL env variable | `"/api/performance"` | +| `env.TOPOLOGY_DISCOVERY_API_DOCS_URL` | TOPOLOGY_DISCOVERY_API_DOCS_URL env variable | `"/api/topology"` | | `proxyEnv.CONDUCTOR_URL` | CONDUCTOR_URL proxyEnv variable | `http://conductor-server:8080` | | `proxyEnv.SCHELLAR_URL` | SCHELLAR_URL proxyEnv variable | `http://conductor-server:3000/query` | | `proxyEnv.INVENTORY_URL` | INVENTORY_URL proxyEnv variable | `http://inventory:8000/graphql` | +| `proxyEnv.WS_INVENTORY_URL` | WS_INVENTORY_URL proxyEnv variable | `ws://inventory:8000/graphql` | | `proxyEnv.RESOURCE_MANAGER_URL` | RESOURCE_MANAGER_URL proxyEnv variable | `http://resource-manager:8884/query` | diff --git a/charts/frinx-frontend/values.yaml b/charts/frinx-frontend/values.yaml index 7038be15..3357803b 100644 --- a/charts/frinx-frontend/values.yaml +++ b/charts/frinx-frontend/values.yaml @@ -84,31 +84,30 @@ tolerations: [] affinity: {} env: - AUTH_REDIRECT_SCHEME: "http" - AUTH_ENABLED: false + # PORTAL PARTS CONFIG + AUTH_ENABLED: true + PERFORMANCE_MONITORING_ENABLED: true + + # API CONFIG URL_BASENAME: "/frinxui" - WORKFLOW_MANAGER_ENABLED: true - WORKFLOW_MANAGER_API_URL: "/api/workflow" - WORKFLOW_MANAGER_API_DOCS_URL: "/api/workflow/docs" - UNICONFIG_ENABLED: true - UNICONFIG_API_DOCS_URL: "/api/workflow/docs-uniconfig" - INVENTORY_ENABLED: true - INVENTORY_API_URL: "/api/proxy" - RESOURCE_MANAGER_ENABLED: true RESOURCE_MANAGER_API_URL: "/api/proxy" UNISTORE_API_URL: "/api/unistore" - L3VPN_ENABLED: false - AUTH_CLIENT_ID: "frinx" - AUTH_REDIRECT_DOMAIN: localhost - MSAL_AUTHORITY: https://login.microsoftonline.com/common/ - DEVICE_TOPOLOGY_ENABLED: true + INVENTORY_API_URL: "/api/proxy" INVENTORY_WS_PATH: /api/proxy - INVENTORY_WS_SCHEMA: "ws://" + INVENTORY_WS_SCHEMA: "wss://" + # DOCS + WORKFLOW_MANAGER_API_DOCS_URL: "/swagger/index.html?urls.primaryName=WorkflowManager" + UNICONFIG_API_DOCS_URL: "/swagger/index.html?urls.primaryName=Uniconfig" + RESOURCE_MANAGER_API_DOCS_URL: "/api/resource" + SCHELLAR_API_DOCS_URL: "/api/schedule" + PERFORMANCE_MONITOR_API_DOCS_URL: "/api/performance" + TOPOLOGY_DISCOVERY_API_DOCS_URL: "/api/topology" proxyEnv: CONDUCTOR_URL: http://conductor-server:8080 SCHELLAR_URL: http://conductor-server:3000/query INVENTORY_URL: http://inventory:8000/graphql + WS_INVENTORY_URL: ws://inventory:8000/graphql RESOURCE_MANAGER_URL: http://resource-manager:8884/query proxyResources: {}