Set fixed PostgreSQL image version tag

Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>
Create databases with microservice role as owner
2026-03-20 03:40:49 +00:00 · 2022-10-27 10:19:39 +02:00 · 2022-10-19 11:57:55 +02:00 · 2022-10-14 14:59:11 +02:00 · 2022-10-05 13:47:15 +02:00 · 2022-10-05 13:27:46 +02:00
13 changed files with 96 additions and 57 deletions
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,31 +2,31 @@ apiVersion: v2
 name: openwifi
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-version: 2.6.0-RC7
+version: 2.6.2
 dependencies:
 - name: owgw
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v2.6.0-RC5"
+  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-RC3"
+  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-RC2"
+  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-RC5"
+  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-RC4"
+  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-RC4"
+  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-RC5"
+  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-RC2"
+  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/
--- a/chart/docker/Dockerfile
+++ b/chart/docker/Dockerfile
@@ -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

--- a/chart/docker/clustersysteminfo
+++ b/chart/docker/clustersysteminfo
@@ -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"
--- a/chart/environment-values/values.openwifi-qa.external-db.yaml
+++ b/chart/environment-values/values.openwifi-qa.external-db.yaml
@@ -8,6 +8,7 @@ owgw:

  postgresql:
    enabled: true
+    nameOverride: owgw-pgsql
    fullnameOverride: owgw-pgsql
    postgresqlDatabase: owgw
    postgresqlUsername: owgw
@@ -30,6 +31,7 @@ owgw:
 #
 #  postgresql:
 #    enabled: true
+#    nameOverride: owsec-pgsql
 #    fullnameOverride: owsec-pgsql
 #    postgresqlDatabase: owsec
 #    postgresqlUsername: owsec
@@ -52,6 +54,7 @@ owgw:
 #
 #  postgresql:
 #    enabled: true
+#    nameOverride: owfms-pgsql
 #    fullnameOverride: owfms-pgsql
 #    postgresqlDatabase: owfms
 #    postgresqlUsername: owfms
@@ -74,6 +77,7 @@ owgw:
 #
 #  postgresql:
 #    enabled: true
+#    nameOverride: owprov-pgsql
 #    fullnameOverride: owprov-pgsql
 #    postgresqlDatabase: owprov
 #    postgresqlUsername: owprov
@@ -96,6 +100,7 @@ owanalytics:

  postgresql:
    enabled: true
+    nameOverride: owanalytics-pgsql
    fullnameOverride: owanalytics-pgsql
    postgresqlDatabase: owanalytics
    postgresqlUsername: owanalytics
@@ -118,6 +123,7 @@ owanalytics:
 #
 #  postgresql:
 #    enabled: true
+#    nameOverride: owsub-pgsql
 #    fullnameOverride: owsub-pgsql
 #    postgresqlDatabase: owsub
 #    postgresqlUsername: owsub
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -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
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,16 +1,16 @@
 # Image tags
 COMPOSE_PROJECT_NAME=openwifi
-OWGW_TAG=v2.6.0-RC5
-OWGWUI_TAG=v2.6.0-RC4
-OWSEC_TAG=v2.6.0-RC3
-OWFMS_TAG=v2.6.0-RC2
-OWPROV_TAG=v2.6.0-RC5
-OWPROVUI_TAG=v2.6.0-RC5
-OWANALYTICS_TAG=v2.6.0-RC4
-OWSUB_TAG=v2.6.0-RC2
+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
+ZOOKEEPER_TAG=3.8
+POSTGRESQL_TAG=15.0

 # Microservice root/config directories
 OWGW_ROOT=/owgw-data
--- a/docker-compose/.env.letsencrypt
+++ b/docker-compose/.env.letsencrypt
@@ -1,15 +1,15 @@
 # Image tags
 COMPOSE_PROJECT_NAME=openwifi
-OWGW_TAG=v2.6.0-RC5
-OWGWUI_TAG=v2.6.0-RC4
-OWSEC_TAG=v2.6.0-RC3
-OWFMS_TAG=v2.6.0-RC2
-OWPROV_TAG=v2.6.0-RC5
-OWPROVUI_TAG=v2.6.0-RC5
-OWANALYTICS_TAG=v2.6.0-RC4
-OWSUB_TAG=v2.6.0-RC2
+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
+ZOOKEEPER_TAG=3.8
 ACMESH_TAG=latest
 TRAEFIK_TAG=latest

--- a/docker-compose/.env.selfsigned
+++ b/docker-compose/.env.selfsigned
@@ -1,15 +1,15 @@
 # Image tags
 COMPOSE_PROJECT_NAME=openwifi
-OWGW_TAG=v2.6.0-RC5
-OWGWUI_TAG=v2.6.0-RC4
-OWSEC_TAG=v2.6.0-RC3
-OWFMS_TAG=v2.6.0-RC2
-OWPROV_TAG=v2.6.0-RC5
-OWPROVUI_TAG=v2.6.0-RC5
-OWANALYTICS_TAG=v2.6.0-RC4
-OWSUB_TAG=v2.6.0-RC2
+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
+ZOOKEEPER_TAG=3.8
 ACMESH_TAG=latest
 TRAEFIK_TAG=latest

--- a/docker-compose/deploy.sh
+++ b/docker-compose/deploy.sh
@@ -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
--- a/docker-compose/owgw.env
+++ b/docker-compose/owgw.env
@@ -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
--- a/docker-compose/postgresql.env
+++ b/docker-compose/postgresql.env
@@ -15,6 +15,6 @@ OWPROV_DB_PASSWORD=owprov
 OWANALYTICS_DB=owanalytics
 OWANALYTICS_DB_USER=owanalytics
 OWANALYTICS_DB_PASSWORD=owanalytics
-OWUSB_DB=owsub
-OWUSB_DB_USER=owsub
-OWUSB_DB_PASSWORD=owsub
+OWSUB_DB=owsub
+OWSUB_DB_USER=owsub
+OWSUB_DB_PASSWORD=owsub
--- a/docker-compose/postgresql/init-db.sh
+++ b/docker-compose/postgresql/init-db.sh
@@ -3,21 +3,15 @@ set -e

 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
    CREATE USER $OWGW_DB_USER WITH ENCRYPTED PASSWORD '$OWGW_DB_PASSWORD';
-    CREATE DATABASE $OWGW_DB;
-    GRANT ALL PRIVILEGES ON DATABASE $OWGW_DB TO $OWGW_DB_USER;
+    CREATE DATABASE $OWGW_DB OWNER $OWGW_DB_USER;
    CREATE USER $OWSEC_DB_USER WITH ENCRYPTED PASSWORD '$OWSEC_DB_PASSWORD';
-    CREATE DATABASE $OWSEC_DB;
-    GRANT ALL PRIVILEGES ON DATABASE $OWSEC_DB TO $OWSEC_DB_USER;
+    CREATE DATABASE $OWSEC_DB OWNER $OWSEC_DB_USER;
    CREATE USER $OWFMS_DB_USER WITH ENCRYPTED PASSWORD '$OWFMS_DB_PASSWORD';
-    CREATE DATABASE $OWFMS_DB;
-    GRANT ALL PRIVILEGES ON DATABASE $OWFMS_DB TO $OWFMS_DB_USER;
+    CREATE DATABASE $OWFMS_DB OWNER $OWFMS_DB_USER;
    CREATE USER $OWPROV_DB_USER WITH ENCRYPTED PASSWORD '$OWPROV_DB_PASSWORD';
-    CREATE DATABASE $OWPROV_DB;
-    GRANT ALL PRIVILEGES ON DATABASE $OWPROV_DB TO $OWPROV_DB_USER;
+    CREATE DATABASE $OWPROV_DB OWNER $OWPROV_DB_USER;
    CREATE USER $OWANALYTICS_DB_USER WITH ENCRYPTED PASSWORD '$OWANALYTICS_DB_PASSWORD';
-    CREATE DATABASE $OWANALYTICS_DB;
-    GRANT ALL PRIVILEGES ON DATABASE $OWANALYTICS_DB TO $OWANALYTICS_DB_USER;
+    CREATE DATABASE $OWANALYTICS_DB OWNER $OWANALYTICS_DB_USER;
    CREATE USER $OWSUB_DB_USER WITH ENCRYPTED PASSWORD '$OWSUB_DB_PASSWORD';
-    CREATE DATABASE $OWSUB_DB;
-    GRANT ALL PRIVILEGES ON DATABASE $OWSUB_DB TO $OWSUB_DB_USER;
+    CREATE DATABASE $OWSUB_DB OWNER $OWSUB_DB_USER;
 EOSQL
--- a/docker-compose/traefik/openwifi_letsencrypt.yaml
+++ b/docker-compose/traefik/openwifi_letsencrypt.yaml
@@ -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
Author	SHA1	Message	Date
Johann Hoffmann	adb3a28c1d	Set fixed PostgreSQL image version tag Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>	2022-10-27 10:19:39 +02:00
Johann Hoffmann	8ef3c912f1	Create databases with microservice role as owner Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>	2022-10-19 11:57:55 +02:00
Johann Hoffmann	8922596384	Fix typo in postgresql.env Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>	2022-10-14 14:59:11 +02:00
Johann Hoffmann	7dce187b9d	Pin zookeeper Docker image version in other Compose deployments as well Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>	2022-10-05 13:47:15 +02:00
Johann Hoffmann	1572435145	Pin zookeeper Docker image version to 3.8 Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>	2022-10-05 13:27:46 +02:00
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