From bd037c912e113df1886a13a9dd4894ee2a3df2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Vol=C3=A1k?= Date: Wed, 25 Sep 2024 11:41:48 +0200 Subject: [PATCH] =?UTF-8?q?[frinx-machine]=20Update=20docs=20in=20frinx=20?= =?UTF-8?q?machine=20and=20fix=20oauth2-proxy=20exa=E2=80=A6=20(#426)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jozef Volak --- charts/frinx-machine/Chart.yaml | 2 +- charts/frinx-machine/README.md | 12 +++--------- charts/frinx-machine/README.md.gotmpl | 10 ++-------- charts/frinx-machine/values.yaml | 2 +- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/charts/frinx-machine/Chart.yaml b/charts/frinx-machine/Chart.yaml index b01c68be..2d679b7f 100644 --- a/charts/frinx-machine/Chart.yaml +++ b/charts/frinx-machine/Chart.yaml @@ -7,7 +7,7 @@ description: | Further information is available on [docs.frinx.io](https://docs.frinx.io/frinx-machine/getting-started/). icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4 type: application -version: 10.0.1 +version: 10.0.2 appVersion: 6.2.0 maintainers: - name: FRINX diff --git a/charts/frinx-machine/README.md b/charts/frinx-machine/README.md index 555b827a..934ab219 100644 --- a/charts/frinx-machine/README.md +++ b/charts/frinx-machine/README.md @@ -5,7 +5,7 @@ User specific workflows are designed through the use of OpenConfig NETCONF & YAN The FRINX Machine uses dockerized containers that are designed and tested to work together to create a user specific solution. Further information is available on [docs.frinx.io](https://docs.frinx.io/frinx-machine/getting-started/). -![Version: 10.0.1](https://img.shields.io/badge/Version-10.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.0](https://img.shields.io/badge/AppVersion-6.2.0-informational?style=flat-square) +![Version: 10.0.2](https://img.shields.io/badge/Version-10.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.0](https://img.shields.io/badge/AppVersion-6.2.0-informational?style=flat-square) ## Prerequisites @@ -60,14 +60,8 @@ kubectl delete -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.4 ## UI access -To access UI, enable ingress for KrakenD service - -```console -helm install [RELEASE_NAME] frinx/frinx-machine --set krakend.ingress.enabled=true -``` -Then from browser access: `krakend.127.0.0.1.nip.io` - -Frinx Machine can be deployed with Oauth2-Proxy. Example of configuration can be found in values.yaml +To access UI, use krakend-nginx ingress hostname for KrakenD service and visit Frinx Machine page in your browser on `https://krakend.127.0.0.1.nip.io/frinxui` +Frinx Machine can be deployed with Oauth2-Proxy. Example of configuration can be found in values.yaml. ## Requirements diff --git a/charts/frinx-machine/README.md.gotmpl b/charts/frinx-machine/README.md.gotmpl index ca977f36..428a6b91 100644 --- a/charts/frinx-machine/README.md.gotmpl +++ b/charts/frinx-machine/README.md.gotmpl @@ -57,14 +57,8 @@ kubectl delete -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.4 ## UI access -To access UI, enable ingress for KrakenD service - -```console -helm install [RELEASE_NAME] frinx/{{ template "chart.name" . }} --set krakend.ingress.enabled=true -``` -Then from browser access: `krakend.127.0.0.1.nip.io` - -Frinx Machine can be deployed with Oauth2-Proxy. Example of configuration can be found in values.yaml +To access UI, use krakend-nginx ingress hostname for KrakenD service and visit Frinx Machine page in your browser on `https://krakend.127.0.0.1.nip.io/frinxui` +Frinx Machine can be deployed with Oauth2-Proxy. Example of configuration can be found in values.yaml. {{ template "chart.requirementsSection" . }} diff --git a/charts/frinx-machine/values.yaml b/charts/frinx-machine/values.yaml index 5da3e25a..709f966d 100644 --- a/charts/frinx-machine/values.yaml +++ b/charts/frinx-machine/values.yaml @@ -606,7 +606,7 @@ oauth2-proxy: # https://oauth2-proxy.github.io/oauth2-proxy/configuration/overview custom_sign_in_logo = "/tmp/frinx/frinx.png" - upstreams = ["http://krakend:8080"] + upstreams = "file:///dev/null" cookie_secure = true cookie_expire = 0