Compare commits

...

18 Commits

Author SHA1 Message Date
TIP Automation User
03f6c336b2 Chg: update image tag in helm values to v2.6.2 2022-09-15 11:48:01 +00:00
Dmitry Dunaev
46e8676038 Merge pull request #103 from Telecominfraproject/feature/wifi-10842--docker-compose--iptocountry-2-6
[WIFI-10842] Add: docker-compose support for iptocountry
2022-09-15 14:15:10 +03:00
Dmitry Dunaev
69d942959e [WIFI-10842] Add: docker-compose support for iptocountry
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
2022-09-15 14:13:56 +03:00
TIP Automation User
cea68fce55 Chg: update image tag in helm values to v2.6.1 2022-09-02 10:03:56 +00:00
Dmitry Dunaev
f1ecf39bdb Merge pull request #94 from Telecominfraproject/fix/wifi-10239--pgsql-svc-selectors-v2-6
[WIFI-10239] Fix: add nameOverride for pgsql so that services would point correctly
2022-08-03 15:24:56 +03:00
Dmitry Dunaev
f2f57564ea [WIFI-10239] Fix: add nameOverride for pgsql so that services would point correctly
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
2022-08-03 14:32:21 +03:00
Johann Hoffmann
8afc726c0d [WIFI-10271] rtty does not work (#90)
* Fix websocket key path in Docker Compose deploy script

Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>

* Issues with rrty(s)

When we click on "Connect" in the dashboard, the rtty server (ucentral gw) is sending the connect request to the rtty client (AP) successfully. AP also is responding and connecting to the gw. But there are a couple of issues.

Issue # 1
Immediately after clicking on Connect, the browser takes us to a rtty server (again ucentral gw only.. but on differnt port) url for example, https://owgw.shastacloud.com:5913/connect/fca974d05e9f6b437fc091be914ef8d5, but that page says "Bad Gateway" error. So the server is missing something. Hence we cannot see the AP's connect status on the dashboard as the above page is throwing "Bad gateway" error.

Issue # 2
The rtty daemon on the client (AP) keeps timing out and keeps reconnecting.

Couple of changes to fix these.

The first change is to make the rttys dashboard url https. It will resolve the SSL exception / Bad gw error ie issue #1 in the bug description.

The second change is to set the communication between rtty on AP and rttys on GW as passthrough. The GW pushes non-tls config to the AP  hence AP tries to connect with non-tls, but the rtty server is configured with TLS. We need to make it passthrough until the rttys server supports TLS.

Signed-off-by: Venkat Chimata <venkatch@gmail.com>
Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>

Co-authored-by: Venkat Chimata <venkatch@gmail.com>
2022-07-26 12:46:42 +02:00
Dmitry Dunaev
c1bac7b420 [WIFI-9772] Add: owanalytics and owsub to clustersysteminfo
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
2022-07-21 16:23:52 +03:00
TIP Automation User
f7277d3f5f Chg: update image tag in helm values to v2.6.0 2022-07-11 11:14:31 +00:00
TIP Automation User
962e93fb11 Chg: update image tag in helm values to v2.6.0-RC7 2022-07-11 11:02:44 +00:00
TIP Automation User
efaee1664c Chg: update image tag in helm values to v2.6.0-RC6 2022-07-09 12:18:10 +00:00
Dmitry Dunaev
c811a2c40d Merge pull request #83 from Telecominfraproject/feature/wifi-9928--pgsql-everywhere-2.6
[WIFI-9928] Chg: use external db for all microservices
2022-07-05 11:11:11 +03:00
Dmitry Dunaev
8b1c493490 [WIFI-9928] Chg: use pgsql only for owanalytics and owgw
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
2022-07-05 11:10:46 +03:00
Dmitry Dunaev
48f46f02ba [WIFI-9928] Add: new possible pgsql nodes should be placed on test nodes if it is required
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
2022-07-01 13:16:33 +03:00
Dmitry Dunaev
f008cfc738 [WIFI-9928] Chg: use external db for all microservices
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
2022-07-01 13:00:59 +03:00
Dmitry Dunaev
3cbf83f67d [WIFI-9952] Chg: owgw CPU requests to same as limits, failureThreshold to 5 2022-07-01 12:50:28 +03:00
Dmitry Dunaev
c6ee4f9ab7 [WIFI-9828] Fix: haproxy resources limits typo
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
2022-06-27 10:31:31 +03:00
Johann Hoffmann
749c47877b Update README.md
Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>
2022-06-24 19:42:05 +02:00
14 changed files with 288 additions and 42 deletions

View File

@@ -2,31 +2,31 @@ apiVersion: v2
name: openwifi
appVersion: "1.0"
description: A Helm chart for Kubernetes
version: 2.6.0-RC5
version: 2.6.2
dependencies:
- name: owgw
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v2.6.0-RC3"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v2.6.2"
version: 0.1.0
- name: owsec
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=v2.6.0-RC2"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=v2.6.0"
version: 0.1.0
- name: owfms
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm?ref=v2.6.0-RC1"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm?ref=v2.6.0"
version: 0.1.0
- name: owprov
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov@helm?ref=v2.6.0-RC3"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov@helm?ref=v2.6.0"
version: 0.1.0
- name: owanalytics
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-analytics@helm?ref=v2.6.0-RC3"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-analytics@helm?ref=v2.6.0"
version: 0.1.0
- name: owgwui
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=v2.6.0-RC3"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=v2.6.0"
version: 0.1.0
- name: owprovui
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov-ui@helm?ref=v2.6.0-RC4"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov-ui@helm?ref=v2.6.0"
version: 0.1.0
- name: owsub
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-userportal@helm?ref=v2.6.0-RC1"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-userportal@helm?ref=v2.6.0"
version: 0.1.0
- name: kafka
repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/

View File

@@ -40,6 +40,24 @@ RUN git clone https://github.com/Telecominfraproject/wlan-cloud-owprov.git owpro
&& cp owprov/test_scripts/curl/cli owprov_cli \
&& rm -rf owprov
# OWAnalytics
ARG OWANALYTICS_VERSION=main
RUN git clone https://github.com/Telecominfraproject/wlan-cloud-analytics.git owanalytics \
&& cd owanalytics \
&& git checkout $OWANALYTICS_VERSION \
&& cd /cli \
&& cp owanalytics/test_scripts/curl/cli owanalytics_cli \
&& rm -rf owanalytics
# OWSub
ARG OWSUB_VERSION=main
RUN git clone https://github.com/Telecominfraproject/wlan-cloud-userportal.git owsub \
&& cd owsub \
&& git checkout $OWSUB_VERSION \
&& cd /cli \
&& cp owsub/test_scripts/curl/cli owsub_cli \
&& rm -rf owsub
COPY clustersysteminfo clustersysteminfo
COPY change_credentials change_credentials

View File

@@ -94,6 +94,24 @@ do
let "exit_code_sum+=$(grep ErrorCode result.json | wc -l)"
sleep 1
./owanalytics_cli systeminfo
let "exit_code_sum+=$?"
if [[ ! -s result.json ]]
then
let "exit_code_sum+=1"
fi
let "exit_code_sum+=$(grep ErrorCode result.json | wc -l)"
sleep 1
./owsub_cli systeminfo
let "exit_code_sum+=$?"
if [[ ! -s result.json ]]
then
let "exit_code_sum+=1"
fi
let "exit_code_sum+=$(grep ErrorCode result.json | wc -l)"
sleep 1
let "CHECK_RETRIES-=1"
echo "Exit code sum: $exit_code_sum"
echo "Left retries: $CHECK_RETRIES"

View File

@@ -8,6 +8,7 @@ owgw:
postgresql:
enabled: true
nameOverride: owgw-pgsql
fullnameOverride: owgw-pgsql
postgresqlDatabase: owgw
postgresqlUsername: owgw
@@ -19,3 +20,118 @@ owgw:
limits:
cpu: 250m
memory: 1024Mi
#owsec:
# configProperties:
# storage.type: postgresql
# storage.type.postgresql.host: owsec-pgsql
# storage.type.postgresql.database: owsec
# storage.type.postgresql.username: owsec
# storage.type.postgresql.password: owsec
#
# postgresql:
# enabled: true
# nameOverride: owsec-pgsql
# fullnameOverride: owsec-pgsql
# postgresqlDatabase: owsec
# postgresqlUsername: owsec
# postgresqlPassword: owsec
# resources:
# requests:
# cpu: 250m
# memory: 1024Mi
# limits:
# cpu: 250m
# memory: 1024Mi
#owfms:
# configProperties:
# storage.type: postgresql
# storage.type.postgresql.host: owfms-pgsql
# storage.type.postgresql.database: owfms
# storage.type.postgresql.username: owfms
# storage.type.postgresql.password: owfms
#
# postgresql:
# enabled: true
# nameOverride: owfms-pgsql
# fullnameOverride: owfms-pgsql
# postgresqlDatabase: owfms
# postgresqlUsername: owfms
# postgresqlPassword: owfms
# resources:
# requests:
# cpu: 250m
# memory: 1024Mi
# limits:
# cpu: 250m
# memory: 1024Mi
#owprov:
# configProperties:
# storage.type: postgresql
# storage.type.postgresql.host: owprov-pgsql
# storage.type.postgresql.database: owprov
# storage.type.postgresql.username: owprov
# storage.type.postgresql.password: owprov
#
# postgresql:
# enabled: true
# nameOverride: owprov-pgsql
# fullnameOverride: owprov-pgsql
# postgresqlDatabase: owprov
# postgresqlUsername: owprov
# postgresqlPassword: owprov
# resources:
# requests:
# cpu: 250m
# memory: 1024Mi
# limits:
# cpu: 250m
# memory: 1024Mi
owanalytics:
configProperties:
storage.type: postgresql
storage.type.postgresql.host: owanalytics-pgsql
storage.type.postgresql.database: owanalytics
storage.type.postgresql.username: owanalytics
storage.type.postgresql.password: owanalytics
postgresql:
enabled: true
nameOverride: owanalytics-pgsql
fullnameOverride: owanalytics-pgsql
postgresqlDatabase: owanalytics
postgresqlUsername: owanalytics
postgresqlPassword: owanalytics
resources:
requests:
cpu: 250m
memory: 1024Mi
limits:
cpu: 250m
memory: 1024Mi
#owsub:
# configProperties:
# storage.type: postgresql
# storage.type.postgresql.host: owsub-pgsql
# storage.type.postgresql.database: owsub
# storage.type.postgresql.username: owsub
# storage.type.postgresql.password: owsub
#
# postgresql:
# enabled: true
# nameOverride: owsub-pgsql
# fullnameOverride: owsub-pgsql
# postgresqlDatabase: owsub
# postgresqlUsername: owsub
# postgresqlPassword: owsub
# resources:
# requests:
# cpu: 250m
# memory: 1024Mi
# limits:
# cpu: 250m
# memory: 1024Mi

View File

@@ -30,6 +30,22 @@ owsec:
operator: "Exists"
effect: "NoSchedule"
postgresql:
primary:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
readReplicas:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
owgwui:
nodeSelector:
env: tests
@@ -46,6 +62,22 @@ owfms:
operator: "Exists"
effect: "NoSchedule"
postgresql:
primary:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
readReplicas:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
owprov:
nodeSelector:
env: tests
@@ -54,6 +86,22 @@ owprov:
operator: "Exists"
effect: "NoSchedule"
postgresql:
primary:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
readReplicas:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
owprovui:
nodeSelector:
env: tests
@@ -102,6 +150,46 @@ owanalytics:
operator: "Exists"
effect: "NoSchedule"
postgresql:
primary:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
readReplicas:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
owsub:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
postgresql:
primary:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
readReplicas:
nodeSelector:
env: tests
tolerations:
- key: "tests"
operator: "Exists"
effect: "NoSchedule"
kafka:
nodeSelector:
env: tests

View File

@@ -5,10 +5,13 @@ owgw:
readiness:
exec:
command: ["true"]
failureThreshold: 5
readiness:
failureThreshold: 5
resources:
requests:
cpu: 1000m
cpu: 2000m
memory: 100Mi
limits:
cpu: 2000m
@@ -622,7 +625,7 @@ haproxy:
memory: 20Mi
limits:
cpu: 10m
memory: 20Gi
memory: 20Mi
service:
annotations:
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: ssl

View File

@@ -78,7 +78,7 @@ clustersysteminfo:
images:
clustersysteminfo:
repository: tip-tip-wlan-cloud-ucentral.jfrog.io/clustersysteminfo
tag: main
tag: v2.6.2
pullPolicy: Always
# regcred:
# registry: tip-tip-wlan-cloud-ucentral.jfrog.io

View File

@@ -1,13 +1,13 @@
# Image tags
COMPOSE_PROJECT_NAME=openwifi
OWGW_TAG=v2.6.0-RC3
OWGWUI_TAG=v2.6.0-RC3
OWSEC_TAG=v2.6.0-RC2
OWFMS_TAG=v2.6.0-RC1
OWPROV_TAG=v2.6.0-RC3
OWPROVUI_TAG=v2.6.0-RC4
OWANALYTICS_TAG=v2.6.0-RC3
OWSUB_TAG=v2.6.0-RC1
OWGW_TAG=v2.6.2
OWGWUI_TAG=v2.6.0
OWSEC_TAG=v2.6.0
OWFMS_TAG=v2.6.0
OWPROV_TAG=v2.6.0
OWPROVUI_TAG=v2.6.0
OWANALYTICS_TAG=v2.6.0
OWSUB_TAG=v2.6.0
KAFKA_TAG=latest
ZOOKEEPER_TAG=latest
POSTGRESQL_TAG=latest

View File

@@ -1,13 +1,13 @@
# Image tags
COMPOSE_PROJECT_NAME=openwifi
OWGW_TAG=v2.6.0-RC3
OWGWUI_TAG=v2.6.0-RC3
OWSEC_TAG=v2.6.0-RC2
OWFMS_TAG=v2.6.0-RC1
OWPROV_TAG=v2.6.0-RC3
OWPROVUI_TAG=v2.6.0-RC4
OWANALYTICS_TAG=v2.6.0-RC3
OWSUB_TAG=v2.6.0-RC1
OWGW_TAG=v2.6.2
OWGWUI_TAG=v2.6.0
OWSEC_TAG=v2.6.0
OWFMS_TAG=v2.6.0
OWPROV_TAG=v2.6.0
OWPROVUI_TAG=v2.6.0
OWANALYTICS_TAG=v2.6.0
OWSUB_TAG=v2.6.0
KAFKA_TAG=latest
ZOOKEEPER_TAG=latest
ACMESH_TAG=latest

View File

@@ -1,13 +1,13 @@
# Image tags
COMPOSE_PROJECT_NAME=openwifi
OWGW_TAG=v2.6.0-RC3
OWGWUI_TAG=v2.6.0-RC3
OWSEC_TAG=v2.6.0-RC2
OWFMS_TAG=v2.6.0-RC1
OWPROV_TAG=v2.6.0-RC3
OWPROVUI_TAG=v2.6.0-RC4
OWANALYTICS_TAG=v2.6.0-RC3
OWSUB_TAG=v2.6.0-RC1
OWGW_TAG=v2.6.2
OWGWUI_TAG=v2.6.0
OWSEC_TAG=v2.6.0
OWFMS_TAG=v2.6.0
OWPROV_TAG=v2.6.0
OWPROVUI_TAG=v2.6.0
OWANALYTICS_TAG=v2.6.0
OWSUB_TAG=v2.6.0
KAFKA_TAG=latest
ZOOKEEPER_TAG=latest
ACMESH_TAG=latest

View File

@@ -9,8 +9,8 @@ The repository also contains a separate Docker Compose deployment to set up the
- [LB deployment with Letsencrypt certificates](#lb-deployment-with-letsencrypt-certificates)
- [OWLS deployment with self-signed certificates](owls/README.md)
### Configuration
If you don't bind mount your own config files they are generated on every startup based on the environment variables in the microservice specific env files. For an overview of the supported configuration properties have a look into the microservice specific env files. For an explanation of the configuration properties please see the README in the respective microservice repository.
Be aware that the non-LB deployment exposes the generated config files on the host. So if you want to make configuration changes afterwards, please do them directly in the config files located in the microservice data directories.
Config files for the microservices are generated on every startup based on the environment variables in the microservice specific env files. For an overview of the supported configuration properties have a look into these files. For an explanation of the configuration properties please see the README in the respective microservice repository.
Be aware that local changes to the config files will be overwritten on every startup if `TEMPLATE_CONFIG` is set to `true` in the microservice env files. If you want to bind mount your own config file or make local changes, please set this variable to `false`.
#### Required password changing on the first startup
One important action that must be done before using the deployment is changing password for the default user in owsec as described in [owsec docs](https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/tree/main#changing-default-password). Please use these docs to find the actions that must be done **after** the deployment in order to start using your deployment.
### Ports

View File

@@ -122,7 +122,7 @@ if [[ ! -z "$WEBSOCKET_CERT" ]]; then
echo "$WEBSOCKET_CERT" > certs/websocket-cert.pem
fi
if [[ ! -z "$WEBSOCKET_KEY" ]]; then
echo "$WEBSOCKET_KEY" > certs/websocket-key.pem && chmod 600 websocket-key.pem
echo "$WEBSOCKET_KEY" > certs/websocket-key.pem && chmod 600 certs/websocket-key.pem
fi
sed -i "s~.*FILEUPLOADER_HOST_NAME=.*~FILEUPLOADER_HOST_NAME=$OWGW_FILEUPLOADER_HOST_NAME~" owgw.env

View File

@@ -38,6 +38,9 @@ SYSTEM_URI_PRIVATE=https://owgw.wlan.local:17002
SYSTEM_URI_PUBLIC=https://openwifi.wlan.local:16002
SYSTEM_URI_UI=https://openwifi.wlan.local
#SIMULATORID=
#IPTOCOUNTRY_PROVIDER=ipinfo
#IPTOCOUNTRY_IPINFO_TOKEN=
#IPTOCOUNTRY_IPDATA_APIKEY=
#RTTY_INTERNAL=true
#RTTY_ENABLED=true
RTTY_SERVER=openwifi.wlan.local

View File

@@ -39,7 +39,7 @@ http:
owgw-rttys-view:
loadBalancer:
servers:
- url: "http://owgw.wlan.local:5913/"
- url: "https://owgw.wlan.local:5913/"
routers:
owgw-ui-http:
@@ -134,6 +134,6 @@ tcp:
owgw-rttys:
entryPoints: "owgwrttys"
service: "owgw-rttys"
rule: "HostSNI(`{{ env "SDKHOSTNAME" }}`)"
rule: "HostSNI(`*`)"
tls:
certResolver: openwifi
passthrough: true