From 5bd8af031dcbf224cb171b0647dea864519bb1e3 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 3 Nov 2022 10:48:00 +0300 Subject: [PATCH] [WIFI-11464] Fix: UI SEC env variables Signed-off-by: Dmitry Dunaev --- chart/environment-values/deploy.sh | 5 ++--- chart/environment-values/values.aws.yaml | 2 +- chart/environment-values/values.base.insecure.yaml | 3 +-- chart/environment-values/values.base.secure.yaml | 3 +-- docker-compose/README.md | 12 ++++++------ docker-compose/deploy.sh | 2 +- docker-compose/owgw-ui.env | 3 +-- docker-compose/owls/deploy_owls.sh | 2 +- docker-compose/owls/owls-ui.env | 3 +-- 9 files changed, 15 insertions(+), 20 deletions(-) diff --git a/chart/environment-values/deploy.sh b/chart/environment-values/deploy.sh index 551a58f..fe2deac 100755 --- a/chart/environment-values/deploy.sh +++ b/chart/environment-values/deploy.sh @@ -194,7 +194,7 @@ helm upgrade --install --create-namespace --wait --timeout 60m \ --set owfms.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ --set owgwui.ingresses.default.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=webui-${NAMESPACE}.cicd.lab.wlan.tip.build \ --set owgwui.ingresses.default.hosts={webui-${NAMESPACE}.cicd.lab.wlan.tip.build} \ - --set owgwui.public_env_variables.DEFAULT_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ + --set owgwui.public_env_variables.REACT_APP_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ --set owprov.services.owprov.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=prov-${NAMESPACE}.cicd.lab.wlan.tip.build \ --set owprov.configProperties."openwifi\.system\.uri\.public"=https://prov-${NAMESPACE}.cicd.lab.wlan.tip.build:16005 \ --set owprov.configProperties."openwifi\.system\.uri\.private"=$INTERNAL_RESTAPI_ENDPOINT_SCHEMA://owprov-owprov:17005 \ @@ -203,7 +203,6 @@ helm upgrade --install --create-namespace --wait --timeout 60m \ --set owprov.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ --set owprovui.ingresses.default.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=provui-${NAMESPACE}.cicd.lab.wlan.tip.build \ --set owprovui.ingresses.default.hosts={provui-${NAMESPACE}.cicd.lab.wlan.tip.build} \ - --set owprovui.public_env_variables.DEFAULT_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ --set owprovui.public_env_variables.REACT_APP_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ --set owanalytics.services.owanalytics.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=analytics-${NAMESPACE}.cicd.lab.wlan.tip.build \ --set owanalytics.configProperties."openwifi\.system\.uri\.public"=https://analytics-${NAMESPACE}.cicd.lab.wlan.tip.build:16009 \ @@ -223,7 +222,7 @@ helm upgrade --install --create-namespace --wait --timeout 60m \ --set owls.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \ --set owlsui.ingresses.default.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=lsui-${NAMESPACE}.cicd.lab.wlan.tip.build \ --set owlsui.ingresses.default.hosts={lsui-${NAMESPACE}.cicd.lab.wlan.tip.build} \ - --set owlsui.public_env_variables.DEFAULT_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ + --set owlsui.public_env_variables.REACT_APP_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ --set owrrm.public_env_variables.SERVICECONFIG_PUBLICENDPOINT=https://rrm-${NAMESPACE}.cicd.lab.wlan.tip.build:16789 \ --set owrrm.services.owrrm.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=rrm-${NAMESPACE}.cicd.lab.wlan.tip.build \ --set haproxy.service.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=$HAPROXY_SERVICE_DNS_RECORDS \ diff --git a/chart/environment-values/values.aws.yaml b/chart/environment-values/values.aws.yaml index 6f1ba8d..6e08d88 100644 --- a/chart/environment-values/values.aws.yaml +++ b/chart/environment-values/values.aws.yaml @@ -29,7 +29,7 @@ owgwui: servicePort: http public_env_variables: - DEFAULT_UCENTRALSEC_URL: https://sec.cicd.lab.wlan.tip.build:16001 # TODO change to OWSEC RESTAPI url + REACT_APP_UCENTRALSEC_URL: https://sec.cicd.lab.wlan.tip.build:16001 # TODO change to OWSEC RESTAPI url owsec: configProperties: # TODO change FQDNs and credentials diff --git a/chart/environment-values/values.base.insecure.yaml b/chart/environment-values/values.base.insecure.yaml index 505f6c2..0692ca5 100644 --- a/chart/environment-values/values.base.insecure.yaml +++ b/chart/environment-values/values.base.insecure.yaml @@ -70,11 +70,10 @@ owrrm: owgwui: public_env_variables: - DEFAULT_UCENTRALSEC_URL: http://localhost:16001 + REACT_APP_UCENTRALSEC_URL: http://localhost:16001 owprovui: public_env_variables: - DEFAULT_UCENTRALSEC_URL: http://localhost:16001 REACT_APP_UCENTRALSEC_URL: http://localhost:16001 kafka: diff --git a/chart/environment-values/values.base.secure.yaml b/chart/environment-values/values.base.secure.yaml index 27a48fa..39f4110 100644 --- a/chart/environment-values/values.base.secure.yaml +++ b/chart/environment-values/values.base.secure.yaml @@ -316,11 +316,10 @@ owrrm: owgwui: public_env_variables: - DEFAULT_UCENTRALSEC_URL: https://localhost:16001 + REACT_APP_UCENTRALSEC_URL: https://localhost:16001 owprovui: public_env_variables: - DEFAULT_UCENTRALSEC_URL: https://localhost:16001 REACT_APP_UCENTRALSEC_URL: https://localhost:16001 kafka: diff --git a/docker-compose/README.md b/docker-compose/README.md index 2cf7123..c3b60a3 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -56,9 +56,9 @@ export FLAGS="-s --cacert /docker-comp | `RTTY_SERVER` | Set this to your OWGW RTTYS hostname, for example `owgw.example.com`. | | `SYSTEM_URI_UI` | Set this to your OWGW-UI URL, for example `https://owgw-ui.example.com`. | ### owgw-ui.env -| Variable | Description | -| ------------------------- | -------------------------------------------------------------------------- | -| `DEFAULT_UCENTRALSEC_URL` | Set this to your OWSec URL, for example `https://owsec.example.com:16001`. | +| Variable | Description | +| --------------------------- | -------------------------------------------------------------------------- | +| `REACT_APP_UCENTRALSEC_URL` | Set this to your OWSec URL, for example `https://owsec.example.com:16001`. | ### owsec.env | Variable | Description | | ---------------------------------------- | ----------------------------------------------------------------------------------- | @@ -184,9 +184,9 @@ For the Let's Encrypt challenge to work you need a public IP address. The hostna | `SYSTEM_URI_UI` | Set this to your OWGW-UI URL, for example `https://openwifi.example.com`. | ### owgw-ui.env -| Variable | Description | -| ------------------- | ----------------------------------------------------------------------------- | -| `DEFAULT_OWSEC_URL` | Set this to your OWSec URL, for example `https://openwifi.example.com:16001`. | +| Variable | Description | +| --------------------------- | ----------------------------------------------------------------------------- | +| `REACT_APP_UCENTRALSEC_URL` | Set this to your OWSec URL, for example `https://openwifi.example.com:16001`. | ### owsec.env | Variable | Description | diff --git a/docker-compose/deploy.sh b/docker-compose/deploy.sh index caabcb2..5303f36 100755 --- a/docker-compose/deploy.sh +++ b/docker-compose/deploy.sh @@ -142,7 +142,7 @@ if [[ ! -z "$SIMULATORID" ]]; then sed -i "s~.*SIMULATORID=.*~SIMULATORID=$SIMULATORID~" owgw.env fi -sed -i "s~.*DEFAULT_UCENTRALSEC_URL=.*~DEFAULT_UCENTRALSEC_URL=$DEFAULT_UCENTRALSEC_URL~" owgw-ui.env +sed -i "s~.*REACT_APP_UCENTRALSEC_URL=.*~REACT_APP_UCENTRALSEC_URL=$DEFAULT_UCENTRALSEC_URL~" owgw-ui.env if [[ ! -z "$OWSEC_AUTHENTICATION_DEFAULT_USERNAME" ]]; then sed -i "s~.*AUTHENTICATION_DEFAULT_USERNAME=.*~AUTHENTICATION_DEFAULT_USERNAME=$OWSEC_AUTHENTICATION_DEFAULT_USERNAME~" owsec.env diff --git a/docker-compose/owgw-ui.env b/docker-compose/owgw-ui.env index a25c24f..bd9d12d 100644 --- a/docker-compose/owgw-ui.env +++ b/docker-compose/owgw-ui.env @@ -1,2 +1 @@ -DEFAULT_UCENTRALSEC_URL=https://openwifi.wlan.local:16001 -ALLOW_UCENTRALSEC_CHANGE=false +REACT_APP_UCENTRALSEC_URL=https://openwifi.wlan.local:16001 diff --git a/docker-compose/owls/deploy_owls.sh b/docker-compose/owls/deploy_owls.sh index 8fe4c73..af9f8ac 100755 --- a/docker-compose/owls/deploy_owls.sh +++ b/docker-compose/owls/deploy_owls.sh @@ -57,7 +57,7 @@ cd wlan-cloud-ucentral-deploy/docker-compose/owls sed -i "s~\(^INTERNAL_OWSEC_HOSTNAME=\).*~\1$INTERNAL_OWSEC_HOSTNAME~" .env sed -i "s~\(^INTERNAL_OWLS_HOSTNAME=\).*~\1$INTERNAL_OWLS_HOSTNAME~" .env -sed -i "s~\(^DEFAULT_UCENTRALSEC_URL=\).*~\1$DEFAULT_UCENTRALSEC_URL~" owls-ui.env +sed -i "s~\(^REACT_APP_UCENTRALSEC_URL=\).*~\1$DEFAULT_UCENTRALSEC_URL~" owls-ui.env sed -i "s~.*AUTHENTICATION_DEFAULT_USERNAME=.*~AUTHENTICATION_DEFAULT_USERNAME=$OWSEC_AUTHENTICATION_DEFAULT_USERNAME~" owsec.env sed -i "s~.*AUTHENTICATION_DEFAULT_PASSWORD=.*~AUTHENTICATION_DEFAULT_PASSWORD=$OWSEC_AUTHENTICATION_DEFAULT_PASSWORD~" owsec.env diff --git a/docker-compose/owls/owls-ui.env b/docker-compose/owls/owls-ui.env index df1b6fa..bd9d12d 100644 --- a/docker-compose/owls/owls-ui.env +++ b/docker-compose/owls/owls-ui.env @@ -1,2 +1 @@ -DEFAULT_UCENTRALSEC_URL=https://openwifi-owls.wlan.local:16001 -ALLOW_UCENTRALSEC_CHANGE=false +REACT_APP_UCENTRALSEC_URL=https://openwifi.wlan.local:16001