Update owanalytics.env

https://telecominfraproject.atlassian.net/browse/WIFI-13386

Signed-off-by: stephb9959 <stephane.bourque@gmail.com>

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
     needs: envs
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -72,7 +72,7 @@ jobs:
     needs: envs
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -95,7 +95,7 @@ jobs:
     needs: envs
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: Telecominfraproject/.github
         path: github

.github/workflows/clustersysteminfo_image_ci.yml

@@ -22,7 +22,7 @@ jobs:
       DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Build Docker image
       working-directory: chart/docker

.github/workflows/enforce-jira-issue-key.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout actions repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: Telecominfraproject/.github
           path: github

.github/workflows/git-release.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         path: wlan-cloud-ucentral-deploy
 
@@ -36,7 +36,7 @@ jobs:
       run: |
         pip3 install yq
         helm plugin install https://github.com/databus23/helm-diff
-        helm plugin install https://github.com/aslafy-z/helm-git --version 0.16.0
+        helm plugin install https://github.com/aslafy-z/helm-git
         ls ~/.local/share/helm/plugins/helm-git/helm-git-plugin.sh || true
         sed 's/--skip-refresh //' -i ~/.local/share/helm/plugins/helm-git/helm-git-plugin.sh
 
@@ -54,6 +54,6 @@ jobs:
         git config --global credential.helper store
         git config --global user.email "tip-automation@telecominfraproject.com"
         git config --global user.name "TIP Automation User"
-        #helm repo add bitnami https://charts.bitnami.com/bitnami
+        helm repo add bitnami https://charts.bitnami.com/bitnami
         helm repo update
         ./git-release-tool.sh

.github/workflows/release.yml

@@ -11,13 +11,13 @@ defaults:
 
 jobs:
   helm-package:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
       HELM_REPO_USERNAME: ucentral
     steps:
       - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           path: wlan-cloud-ucentral-deploy
           repository: Telecominfraproject/wlan-cloud-ucentral-deploy
@@ -42,9 +42,9 @@ jobs:
       - name: Build package
         working-directory: wlan-cloud-ucentral-deploy/chart
         run: |
-          helm plugin install https://github.com/aslafy-z/helm-git --version 0.16.0
-          #helm repo add bitnami https://charts.bitnami.com/bitnami
-          #helm repo update
+          helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo update
           helm dependency update
           mkdir dist
           helm package . -d dist
@@ -70,7 +70,7 @@ jobs:
           cat Chart.yaml | yq -r '.dependencies[] | "\(.name) - \(.repository) v\(.version)"' >> release.txt
 
       - name: Create GitHub release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           body_path: wlan-cloud-ucentral-deploy/chart/release.txt
           files: wlan-cloud-ucentral-deploy/chart/dist/*
@@ -80,7 +80,7 @@ jobs:
     needs: helm-package
     steps:
     - name: Trigger testing of release
-      uses: peter-evans/repository-dispatch@v3
+      uses: peter-evans/repository-dispatch@v1
       with:
         token: ${{ secrets.WLAN_TESTING_PAT }}
         repository: Telecominfraproject/wlan-testing

chart/Chart.yaml

@@ -2,35 +2,39 @@ apiVersion: v2
 name: openwifi
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-version: 3.1.0
+version: 0.1.0
 dependencies:
 - name: owgw
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=master"
   version: 0.1.0
 - name: owsec
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=main"
   version: 0.1.0
 - name: owfms
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm?ref=main"
   version: 0.1.0
 - name: owprov
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov@helm?ref=main"
   version: 0.1.0
 - name: owanalytics
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-analytics@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-analytics@helm?ref=main"
   version: 0.1.0
 - name: owgwui
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=main"
   version: 0.1.0
 - name: owprovui
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov-ui@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov-ui@helm?ref=main"
   version: 0.1.0
 - name: owsub
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-userportal@helm?ref=v3.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-userportal@helm?ref=main"
   version: 0.1.0
 - name: owrrm
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-rrm@helm?ref=v2.8.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-rrm@helm?ref=main"
   version: 0.1.0
+- name: kafka
+  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  version: 13.0.2
+  condition: kafka.enabled
 - name: owls
   repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owls@helm?ref=main"
   version: 0.1.0
@@ -39,15 +43,11 @@ dependencies:
   repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owls-ui@helm?ref=master"
   version: 0.1.0
   condition: owlsui.enabled
-- name: kafka
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 28.2.3
-  condition: kafka.enabled
 - name: haproxy
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 0.13.3
+  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  version: 0.2.21
   condition: haproxy.enabled
-- name: postgresql
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 13.4.3
-  condition: postgresql.enabled
+- name: postgresql-ha
+  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  version: 8.6.13
+  condition: postgresql-ha.enabled

chart/environment-values/.gitignore

@@ -1,3 +0,0 @@
-_values.custom-*.yaml
-certs/
-env_*

chart/environment-values/cleanup.sh

@@ -1,15 +1,6 @@
 #!/bin/bash
 [ -z "$NAMESPACE" ] && echo "No NAMESPACE set" && exit 1
-ns="openwifi-$NAMESPACE"
-echo "Cleaning up namespace $ns in 10 seconds..."
-sleep 10
-echo "- delete tip-openwifi helm release in $ns"
-helm -n "$ns" delete tip-openwifi
-if [[ "$1" == "full" ]] ; then
-    echo "- delete $ns namespace in 30 seconds..."
-    sleep 30
-    echo "- delete $ns namespace"
-    kubectl delete ns "$ns"
-fi
-echo "- cleaned up $ns namespace"
-exit 0
+helm -n openwifi-"$NAMESPACE" delete tip-openwifi
+sleep 30
+kubectl delete ns openwifi-"$NAMESPACE"
+exit 0

chart/environment-values/deploy.sh

@@ -2,47 +2,48 @@
 set -e
 
 # Usage function
-function usage()
-{
-    cat <<-EOF >&2
-
-This script is indended for OpenWIFI Cloud SDK deployment to TIP QA/Dev environments using assembly Helm chart (https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) with configuration through environment variables
-
-Required environment variables:
-- NAMESPACE - namespace suffix that will used added for the Kubernetes environment (i.e. if you pass 'test', kubernetes namespace will be named 'ucentral-test')
-- DEPLOY_METHOD - deployment method for the chart deployment (supported methods - 'git' (will use helm-git from assembly chart), 'bundle' (will use chart stored in the Artifactory) or local
-- CHART_VERSION - version of chart to be deployed from assembly chart (for 'git' method git ref may be passed, for 'bundle' method version of chart may be passed)
-- VALUES_FILE_LOCATION - path to file with override values that may be used for deployment
-- DOMAIN - Domain name. default: cicd.lab.wlan.tip.build
-- OWGW_AUTH_USERNAME - username to be used for requests to OpenWIFI Security
-- OWGW_AUTH_PASSWORD - hashed password for OpenWIFI Security (details on this may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/#authenticationdefaultpassword)
-- OWFMS_S3_SECRET - secret key that is used for OpenWIFI Firmware access to firmwares S3 bucket
-- OWFMS_S3_KEY - access key that is used for OpenWIFI Firmware access to firmwares S3 bucket
-- OWSEC_NEW_PASSWORD - password that should be set to default user instead of default password from properties
-- CERT_LOCATION - path to certificate in PEM format that will be used for securing all endpoint in all services
-- KEY_LOCATION - path to private key in PEM format that will be used for securing all endpoint in all services
-
-The following environmnet variables may be passed, but will be ignored if CHART_VERSION is set to release (i.e. v2.4.0):
-- OWGW_VERSION - OpenWIFI Gateway version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWGWUI_VERSION - OpenWIFI Web UI version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWSEC_VERSION - OpenWIFI Security version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWFMS_VERSION - OpenWIFI Firmware version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWPROV_VERSION - OpenWIFI Provisioning version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWPROVUI_VERSION - OpenWIFI Provisioning Web UI version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWANALYTICS_VERSION - OpenWIFI Analytics version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWSUB_VERSION - OpenWIFI Subscription (Userportal) version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-- OWRRM_VERSION - OpenWIFI radio resource management service (RRM) version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
-
-Optional environment variables:
-- EXTRA_VALUES - extra values that should be passed to Helm deployment separated by comma (,)
-- DEVICE_CERT_LOCATION - path to certificate in PEM format that will be used for load simulator
-- DEVICE_KEY_LOCATION - path to private key in PEM format that will be used for load simulator
-- USE_SEPARATE_OWGW_LB - flag that should change split external DNS for OWGW and other services
-- INTERNAL_RESTAPI_ENDPOINT_SCHEMA - what schema to use for internal RESTAPI endpoints (https by default)
-- IPTOCOUNTRY_IPINFO_TOKEN - token that should be set for IPInfo support (owgw/owprov iptocountry.ipinfo.token properties), ommited if not passed
-- MAILER_USERNAME - SMTP username used for OWSEC mailer
-- MAILER_PASSWORD - SMTP password used for OWSEC mailer (only if both MAILER_PASSWORD and MAILER_USERNAME are set, mailer will be enabled)
-EOF
+usage () {
+  echo >&2;
+  echo "This script is indended for OpenWIFI Cloud SDK deployment to TIP QA/Dev environments using assembly Helm chart (https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) with configuration through environment variables" >&2;
+  echo >&2;
+  echo "Required environment variables:" >&2;
+  echo >&2;
+  echo "- NAMESPACE - namespace suffix that will used added for the Kubernetes environment (i.e. if you pass 'test', kubernetes namespace will be named 'ucentral-test')" >&2;
+  echo "- DEPLOY_METHOD - deployment method for the chart deployment (supported methods - 'git' (will use helm-git from assembly chart) and 'bundle' (will use chart stored in the Artifactory0" >&2;
+  echo "- CHART_VERSION - version of chart to be deployed from assembly chart (for 'git' method git ref may be passed, for 'bundle' method version of chart may be passed)" >&2;
+  echo >&2;
+  echo "- VALUES_FILE_LOCATION - path to file with override values that may be used for deployment" >&2;
+  echo "- DOMAIN - Domain name. default: cicd.lab.wlan.tip.build" >&2;
+  echo "- OWGW_AUTH_USERNAME - username to be used for requests to OpenWIFI Security" >&2;
+  echo "- OWGW_AUTH_PASSWORD - hashed password for OpenWIFI Security (details on this may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/#authenticationdefaultpassword)" >&2;
+  echo "- OWFMS_S3_SECRET - secret key that is used for OpenWIFI Firmware access to firmwares S3 bucket" >&2;
+  echo "- OWFMS_S3_KEY - access key that is used for OpenWIFI Firmware access to firmwares S3 bucket" >&2;
+  echo "- OWSEC_NEW_PASSWORD - password that should be set to default user instead of default password from properties" >&2;
+  echo "- CERT_LOCATION - path to certificate in PEM format that will be used for securing all endpoint in all services" >&2;
+  echo "- KEY_LOCATION - path to private key in PEM format that will be used for securing all endpoint in all services" >&2;
+  echo >&2;
+  echo "Following environmnet variables may be passed, but will be ignored if CHART_VERSION is set to release (i.e. v2.4.0):" >&2;
+  echo >&2;
+  echo "- OWGW_VERSION - OpenWIFI Gateway version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWGWUI_VERSION - OpenWIFI Web UI version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWSEC_VERSION - OpenWIFI Security version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWFMS_VERSION - OpenWIFI Firmware version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWPROV_VERSION - OpenWIFI Provisioning version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWPROVUI_VERSION - OpenWIFI Provisioning Web UI version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWANALYTICS_VERSION - OpenWIFI Analytics version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWSUB_VERSION - OpenWIFI Subscription (Userportal) version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo "- OWRRM_VERSION - OpenWIFI radio resource management service (RRM) version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)" >&2;
+  echo >&2;
+  echo "Optional environment variables:" >&2;
+  echo >&2;
+  echo "- EXTRA_VALUES - extra values that should be passed to Helm deployment separated by comma (,)" >&2;
+  echo "- DEVICE_CERT_LOCATION - path to certificate in PEM format that will be used for load simulator" >&2;
+  echo "- DEVICE_KEY_LOCATION - path to private key in PEM format that will be used for load simulator" >&2;
+  echo "- USE_SEPARATE_OWGW_LB - flag that should change split external DNS for OWGW and other services" >&2;
+  echo "- INTERNAL_RESTAPI_ENDPOINT_SCHEMA - what schema to use for internal RESTAPI endpoints (https by default)" >&2;
+  echo "- IPTOCOUNTRY_IPINFO_TOKEN - token that should be set for IPInfo support (owgw/owprov iptocountry.ipinfo.token properties), ommited if not passed" >&2;
+  echo "- MAILER_USERNAME - SMTP username used for OWSEC mailer" >&2;
+  echo "- MAILER_PASSWORD - SMTP password used for OWSEC mailer (only if both MAILER_PASSWORD and MAILER_USERNAME are set, mailer will be enabled)" >&2;
 }
 
 # Global variables
@@ -50,30 +51,32 @@ VALUES_FILE_LOCATION_SPLITTED=()
 EXTRA_VALUES_SPLITTED=()
 
 # Helper functions
-function check_if_chart_version_is_release()
-{
-    [[ "$CHART_VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]
+check_if_chart_version_is_release() {
+  PARSED_CHART_VERSION=$(echo $CHART_VERSION | grep -xP "v[0-9]+\.[0-9]+\.[0-9]+.*")
+  if [[ -z "$PARSED_CHART_VERSION" ]]; then
+    return 1
+  else
+    return 0
+  fi
 }
 
 # Check if required environment variables were passed
 ## Deployment specifics
 [ -z ${DEPLOY_METHOD+x} ] && echo "DEPLOY_METHOD is unset" >&2 && usage && exit 1
 [ -z ${CHART_VERSION+x} ] && echo "CHART_VERSION is unset" >&2 && usage && exit 1
-if [[ "$DEPLOY_METHOD" != "local" ]] ; then
-    if check_if_chart_version_is_release ; then
-        echo "Chart version ($CHART_VERSION) is a release version, ignoring services versions"
-    else
-        echo "Chart version ($CHART_VERSION) is not a release version, checking if services versions are set"
-        [ -z ${OWGW_VERSION+x} ] && echo "OWGW_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWGWUI_VERSION+x} ] && echo "OWGWUI_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWSEC_VERSION+x} ] && echo "OWSEC_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWFMS_VERSION+x} ] && echo "OWFMS_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWPROV_VERSION+x} ] && echo "OWPROV_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWPROVUI_VERSION+x} ] && echo "OWPROVUI_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWANALYTICS_VERSION+x} ] && echo "OWANALYTICS_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWSUB_VERSION+x} ] && echo "OWSUB_VERSION is unset" >&2 && usage && exit 1
-        [ -z ${OWRRM_VERSION+x} ] && echo "OWRRM_VERSION is unset" >&2 && usage && exit 1
-    fi
+if check_if_chart_version_is_release; then
+  echo "Chart version ($CHART_VERSION) is release version, ignoring services versions"
+else
+  echo "Chart version ($CHART_VERSION) is not release version, checking if services versions are set"
+  [ -z ${OWGW_VERSION+x} ] && echo "OWGW_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWGWUI_VERSION+x} ] && echo "OWGWUI_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWSEC_VERSION+x} ] && echo "OWSEC_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWFMS_VERSION+x} ] && echo "OWFMS_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWPROV_VERSION+x} ] && echo "OWPROV_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWPROVUI_VERSION+x} ] && echo "OWPROVUI_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWANALYTICS_VERSION+x} ] && echo "OWANALYTICS_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWSUB_VERSION+x} ] && echo "OWSUB_VERSION is unset" >&2 && usage && exit 1
+  [ -z ${OWRRM_VERSION+x} ] && echo "OWRRM_VERSION is unset" >&2 && usage && exit 1
 fi
 ## Environment specifics
 [ -z ${NAMESPACE+x} ] && echo "NAMESPACE is unset" >&2 && usage && exit 1
@@ -105,55 +108,54 @@ export OWANALYTICS_VERSION_TAG=$(echo ${OWANALYTICS_VERSION} | tr '/' '-')
 export OWSUB_VERSION_TAG=$(echo ${OWSUB_VERSION} | tr '/' '-')
 export OWRRM_VERSION_TAG=$(echo ${OWRRM_VERSION} | tr '/' '-')
 
+# Debug get bash version
+bash --version >&2
+
 # Check deployment method that's required for this environment
 helm plugin install https://github.com/databus23/helm-diff || true
-if [[ "$DEPLOY_METHOD" == "git" ]] ; then
-    helm plugin list | grep "^helm-git" || helm plugin install https://github.com/aslafy-z/helm-git || true
-    rm -rf wlan-cloud-ucentral-deploy || true
-    git clone https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy.git
-    cd wlan-cloud-ucentral-deploy
-    git checkout $CHART_VERSION
-    cd chart
-    if ! check_if_chart_version_is_release ; then
-        sed -i '/wlan-cloud-ucentralgw@/s/ref=.*/ref='${OWGW_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-ucentralgw-ui@/s/ref=.*/ref='${OWGWUI_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-ucentralsec@/s/ref=.*/ref='${OWSEC_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-ucentralfms@/s/ref=.*/ref='${OWFMS_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-owprov@/s/ref=.*/ref='${OWPROV_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-owprov-ui@/s/ref=.*/ref='${OWPROVUI_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-analytics@/s/ref=.*/ref='${OWANALYTICS_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-userportal@/s/ref=.*/ref='${OWSUB_VERSION}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-rrm@/s/ref=.*/ref='${OWRRM_VERSION}'\"/g' Chart.yaml
-    fi
-    #helm repo add bitnami https://charts.bitnami.com/bitnami && helm repo update
-    [ -z "$SKIP_DEPS" ] && helm dependency update
-    cd ../..
-    export DEPLOY_SOURCE="wlan-cloud-ucentral-deploy/chart"
-elif [[ "$DEPLOY_METHOD" == "bundle" ]] ; then
-    helm repo add tip-wlan-cloud-ucentral-helm https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/ || true
-    export DEPLOY_SOURCE="tip-wlan-cloud-ucentral-helm/openwifi --version $CHART_VERSION"
-elif [[ "$DEPLOY_METHOD" == "local" ]] ; then
-    export DEPLOY_SOURCE=".."
-    pushd ..
-    [ -z "$SKIP_DEPS" ] && helm dependency update
-    popd
+if [[ "$DEPLOY_METHOD" == "git" ]]; then
+  helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0 || true
+  rm -rf wlan-cloud-ucentral-deploy || true
+  git clone https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy.git
+  cd wlan-cloud-ucentral-deploy
+  git checkout $CHART_VERSION
+  cd chart
+  if ! check_if_chart_version_is_release; then
+    sed -i '/wlan-cloud-ucentralgw@/s/ref=.*/ref='${OWGW_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-ucentralgw-ui@/s/ref=.*/ref='${OWGWUI_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-ucentralsec@/s/ref=.*/ref='${OWSEC_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-ucentralfms@/s/ref=.*/ref='${OWFMS_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-owprov@/s/ref=.*/ref='${OWPROV_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-owprov-ui@/s/ref=.*/ref='${OWPROVUI_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-analytics@/s/ref=.*/ref='${OWANALYTICS_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-userportal@/s/ref=.*/ref='${OWSUB_VERSION}'\"/g' Chart.yaml
+    sed -i '/wlan-cloud-rrm@/s/ref=.*/ref='${OWRRM_VERSION}'\"/g' Chart.yaml
+  fi
+  helm repo add bitnami https://charts.bitnami.com/bitnami
+  helm repo update
+  helm dependency update
+  cd ../..
+  export DEPLOY_SOURCE="wlan-cloud-ucentral-deploy/chart"
+elif [[ "$DEPLOY_METHOD" == "bundle" ]]; then
+  helm repo add tip-wlan-cloud-ucentral-helm https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/ || true
+  export DEPLOY_SOURCE="tip-wlan-cloud-ucentral-helm/openwifi --version $CHART_VERSION"
 else
-    echo "Deploy method is not correct: $DEPLOY_METHOD. Valid values: git, bundle or local" >&2
-    exit 1
+  echo "Deploy method is not correct: $DEPLOY_METHOD. Valid values: git or bundle" >&2
+  exit 1
 fi
 
 VALUES_FILES_FLAGS=()
 IFS=',' read -ra VALUES_FILE_LOCATION_SPLITTED <<< "$VALUES_FILE_LOCATION"
 for VALUE_FILE in ${VALUES_FILE_LOCATION_SPLITTED[*]}; do
-    VALUES_FILES_FLAGS+=("-f" $VALUE_FILE)
+  VALUES_FILES_FLAGS+=("-f" $VALUE_FILE)
 done
 EXTRA_VALUES_FLAGS=()
 IFS=',' read -ra EXTRA_VALUES_SPLITTED <<< "$EXTRA_VALUES"
 for EXTRA_VALUE in ${EXTRA_VALUES_SPLITTED[*]}; do
-    EXTRA_VALUES_FLAGS+=("--set" $EXTRA_VALUE)
+  EXTRA_VALUES_FLAGS+=("--set" $EXTRA_VALUE)
 done
 
-if [[ "$USE_SEPARATE_OWGW_LB" == "true" ]] ; then
+if [[ "$USE_SEPARATE_OWGW_LB" == "true" ]]; then
   export HAPROXY_SERVICE_DNS_RECORDS="sec-${NAMESPACE}.${DOMAIN},fms-${NAMESPACE}.${DOMAIN},prov-${NAMESPACE}.${DOMAIN},analytics-${NAMESPACE}.${DOMAIN},sub-${NAMESPACE}.${DOMAIN}"
   export OWGW_SERVICE_DNS_RECORDS="gw-${NAMESPACE}.${DOMAIN}"
 else
@@ -161,13 +163,21 @@ else
   export OWGW_SERVICE_DNS_RECORDS=""
 fi
 
-envsubst < values.custom.tpl.yaml > _values.custom-${NAMESPACE}.yaml
+echo "Deploying into openwifi-${NAMESPACE} with the following values files:"
+echo ${VALUES_FILES_FLAGS[*]}
+echo
+envsubst < values.custom.tpl.yaml > values.custom-${NAMESPACE}.yaml
 
+echo "Using configuration:"
+echo "---"
+cat values.custom-${NAMESPACE}.yaml
+echo "---"
+set -x
 helm upgrade --install --create-namespace --wait --timeout 60m \
   --namespace openwifi-${NAMESPACE} \
   ${VALUES_FILES_FLAGS[*]} \
   ${EXTRA_VALUES_FLAGS[*]} \
-  -f _values.custom-${NAMESPACE}.yaml \
+  -f values.custom-${NAMESPACE}.yaml \
   --set-file owgw.certs."restapi-cert\.pem"=$CERT_LOCATION \
   --set-file owgw.certs."restapi-key\.pem"=$KEY_LOCATION \
   --set-file owgw.certs."websocket-cert\.pem"=$CERT_LOCATION \

chart/environment-values/values.aws.yaml

@@ -15,8 +15,8 @@ owgwui:
   ingresses:
     default:
       enabled: true
-      className: alb
       annotations:
+        kubernetes.io/ingress.class: alb
         alb.ingress.kubernetes.io/scheme: internet-facing
         alb.ingress.kubernetes.io/group.name: wlan-cicd
         alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:ap-south-1:289708231103:certificate/2cc8c764-11fd-411d-bf7d-a93f488f3f6c
@@ -65,8 +65,8 @@ owprovui:
   ingresses:
     default:
       enabled: true
-      className: alb
       annotations:
+        kubernetes.io/ingress.class: alb
         alb.ingress.kubernetes.io/scheme: internet-facing
         alb.ingress.kubernetes.io/group.name: wlan-cicd
         alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:ap-south-1:289708231103:certificate/2cc8c764-11fd-411d-bf7d-a93f488f3f6c

chart/environment-values/values.base.insecure.yaml

@@ -77,33 +77,10 @@ owprovui:
     REACT_APP_UCENTRALSEC_URL: http://localhost:16001
 
 kafka:
-  volumePermissions:
-    enabled: true
-  commonAnnotations:
-    cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
+  heapOpts: -Xmx512m -Xms512m
   readinessProbe:
     initialDelaySeconds: 45
   livenessProbe:
     initialDelaySeconds: 60
-  kraft:
-    enabled: true
-  heapOpts: -Xmx1024m -Xms1024m
   zookeeper:
-    enabled: false
-  controller:
-    replicaCount: 1
-    extraConfig: |-
-      maxMessageBytes = 1048588
-    extraEnvVars:
-      - name: ALLOW_PLAINTEXT_LISTENER
-        value: "yes"
-  listeners:
-    client:
-      protocol: PLAINTEXT
-      containerPort: 9092
-    controller:
-      protocol: "PLAINTEXT"
-  broker:
-    persistence:
-      size: 20Gi
-    replicaCount: 2
+    heapSize: 256

chart/environment-values/values.base.secure.yaml

@@ -323,43 +323,13 @@ owprovui:
     REACT_APP_UCENTRALSEC_URL: https://localhost:16001
 
 kafka:
-  volumePermissions:
-    enabled: true
-  commonAnnotations:
-    cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
-  #resources:
-  #  requests:
-  #    cpu: 100m
-  #    memory: 512Mi
-  #  limits:
-  #    cpu: 500m
-  #    memory: 1Gi
+  heapOpts: -Xmx512m -Xms512m
   readinessProbe:
     initialDelaySeconds: 45
   livenessProbe:
     initialDelaySeconds: 60
-  kraft:
-    enabled: true
-  heapOpts: -Xmx1024m -Xms1024m
   zookeeper:
-    enabled: false
-  controller:
-    replicaCount: 1
-    extraConfig: |-
-      maxMessageBytes = 1048588
-    extraEnvVars:
-      - name: ALLOW_PLAINTEXT_LISTENER
-        value: "yes"
-  listeners:
-    client:
-      protocol: PLAINTEXT
-      containerPort: 9092
-    controller:
-      protocol: "PLAINTEXT"
-  broker:
-    persistence:
-      size: 20Gi
-    replicaCount: 2
+    heapSize: 256
 
 restapiCerts:
   enabled: true

chart/environment-values/values.openwifi-dev03.yaml

@@ -1,22 +0,0 @@
-owgwui:
-  ingresses:
-    default:
-      annotations:
-        alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
-
-owprovui:
-  ingresses:
-    default:
-      annotations:
-        alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
-
-owrrm:
-  services:
-    owrrm:
-      annotations:
-        service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
-
-haproxy:
-  service:
-    annotations:
-      service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be

chart/environment-values/values.openwifi-qa.disable-radiusproxy.yaml

@@ -1,7 +0,0 @@
-owgw:
-  configProperties:
-    radius.proxy.enable: "false"
-    radius.proxy.accounting.port: 1813
-    radius.proxy.authentication.port: 1812
-    radius.proxy.coa.port: 3799
-    radsec.keepalive: 120

chart/environment-values/values.openwifi-qa.owls-external.yaml

@@ -12,43 +12,25 @@ owgw:
         service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16002,16003,17002"
 
   configProperties:
-    # done by default for owgw now:
-    #simulatorid: 53494D020202
-    # on a host with more CPUs you may need to bump this up from default of 64
-    storage.type.postgresql.maxsessions: 120
-    # this actually disables websocket logging:
-    logging.websocket: true
-    # consider lowering the # of days to keep archives in the database
-    #archiver.db.0.name = healthchecks
-    #archiver.db.0.keep = 1
-    #archiver.db.1.name = statistics
-    #archiver.db.1.keep = 1
-    #archiver.db.2.name = devicelogs
-    #archiver.db.2.keep = 1
-    #archiver.db.3.name = commandlist
-    #archiver.db.3.keep = 1
+    simulatorid: 53494D020202
+    storage.type: postgresql
+    storage.type.postgresql.host: owgw-pgsql
+    storage.type.postgresql.database: owgw
+    storage.type.postgresql.username: owgw
+    storage.type.postgresql.password: owgw
+    openwifi.certificates.allowmismatch: "true"
 
   resources:
     requests:
       cpu: 2000m
-      memory: 3Gi
+      memory: 3000Mi
     limits:
       cpu: 2000m
-      memory: 5Gi
+      memory: 3000Mi
 
-# Postgres tuning for larger # of APs
-#postgresql:
-#  primary:
-#    resourcesPreset: large
-#    persistence:
-#      size: 120Gi
-
-owprov:
-  # consider providing more memory to owprov
-  resources:
-    requests:
-      cpu: 10m
-      memory: 20Mi
-    limits:
-      cpu: 100m
-      memory: 4Gi
+  postgresql:
+    enabled: true
+    fullnameOverride: owgw-pgsql
+    postgresqlDatabase: owgw
+    postgresqlUsername: owgw
+    postgresqlPassword: owgw

chart/environment-values/values.openwifi-qa.single-external-db.yaml

@@ -2,7 +2,7 @@ owgw:
   configProperties:
     simulatorid: 53494D020202
     storage.type: postgresql
-    storage.type.postgresql.host: pgsql
+    storage.type.postgresql.host: pgsql-pgpool
     storage.type.postgresql.database: owgw
     storage.type.postgresql.username: owgw
     storage.type.postgresql.password: owgw
@@ -10,7 +10,7 @@ owgw:
 owsec:
   configProperties:
     storage.type: postgresql
-    storage.type.postgresql.host: pgsql
+    storage.type.postgresql.host: pgsql-pgpool
     storage.type.postgresql.database: owsec
     storage.type.postgresql.username: owsec
     storage.type.postgresql.password: owsec
@@ -18,7 +18,7 @@ owsec:
 owfms:
   configProperties:
     storage.type: postgresql
-    storage.type.postgresql.host: pgsql
+    storage.type.postgresql.host: pgsql-pgpool
     storage.type.postgresql.database: owfms
     storage.type.postgresql.username: owfms
     storage.type.postgresql.password: owfms
@@ -26,7 +26,7 @@ owfms:
 owprov:
   configProperties:
     storage.type: postgresql
-    storage.type.postgresql.host: pgsql
+    storage.type.postgresql.host: pgsql-pgpool
     storage.type.postgresql.database: owprov
     storage.type.postgresql.username: owprov
     storage.type.postgresql.password: owprov
@@ -34,7 +34,7 @@ owprov:
 owanalytics:
   configProperties:
     storage.type: postgresql
-    storage.type.postgresql.host: pgsql
+    storage.type.postgresql.host: pgsql-pgpool
     storage.type.postgresql.database: owanalytics
     storage.type.postgresql.username: owanalytics
     storage.type.postgresql.password: owanalytics
@@ -42,41 +42,15 @@ owanalytics:
 owsub:
   configProperties:
     storage.type: postgresql
-    storage.type.postgresql.host: pgsql
+    storage.type.postgresql.host: pgsql-pgpool
     storage.type.postgresql.database: owsub
     storage.type.postgresql.username: owsub
     storage.type.postgresql.password: owsub
 
-postgresql:
+postgresql-ha:
   enabled: true
   initDbScriptSecret:
     enabled: true
-    initdbScriptsSecret: tip-openwifi-initdb-scripts
-  volumePermissions:
-    enabled: true
-  global:
-    postgresql:
-      auth:
-        postgresPassword: postgres
-  auth:
-    postgresPassword: postgres
-  primary:
-    # Consider using this resource model for small installations
-    #resourcesPreset: medium
-    extendedConfiguration: |-
-      max_connections = 550
-      shared_buffers = 128MB
-    initdb:
-      scriptsSecret: tip-openwifi-initdb-scripts
-    # Consider using this disk size for small installations
-    #persistence:
-    #  size: 30Gi
-
-postgresql-ha:
-  enabled: false
-  initDbScriptSecret:
-    enabled: false
-    initdbScriptsSecret: tip-openwifi-initdb-scripts
   pgpool:
     adminPassword: admin
     resources:

chart/environment-values/values.openwifi-qa.yaml

@@ -357,6 +357,7 @@ owgwui:
     default:
       enabled: true
       annotations:
+        kubernetes.io/ingress.class: alb
         alb.ingress.kubernetes.io/scheme: internet-facing
         alb.ingress.kubernetes.io/group.name: wlan-cicd
         alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:ap-south-1:289708231103:certificate/2cc8c764-11fd-411d-bf7d-a93f488f3f6c
@@ -564,6 +565,7 @@ owprovui:
     default:
       enabled: true
       annotations:
+        kubernetes.io/ingress.class: alb
         alb.ingress.kubernetes.io/scheme: internet-facing
         alb.ingress.kubernetes.io/group.name: wlan-cicd
         alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:ap-south-1:289708231103:certificate/2cc8c764-11fd-411d-bf7d-a93f488f3f6c
@@ -811,50 +813,31 @@ owrrm:
         memory: 512Mi
 
 kafka:
-  volumePermissions:
-    enabled: true
   commonAnnotations:
     cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
+  heapOpts: -Xmx512m -Xms512m
+  resources:
+    requests:
+      cpu: 100m
+      memory: 512Mi
+    limits:
+      cpu: 500m
+      memory: 1Gi
   readinessProbe:
     initialDelaySeconds: 45
   livenessProbe:
     initialDelaySeconds: 60
-  heapOpts: -Xmx1024m -Xms1024m
-  kraft:
-    enabled: true
   zookeeper:
-    enabled: false
-  controller:
-    replicaCount: 1
-    extraConfig: |-
-      maxMessageBytes = 1048588
-    extraEnvVars:
-      - name: ALLOW_PLAINTEXT_LISTENER
-        value: "yes"
+    commonAnnotations:
+      cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
+    heapSize: 256
     resources:
       requests:
-        cpu: 500m
-        memory: 512Mi
+        cpu: 100m
+        memory: 256Mi
       limits:
-        cpu: 750m
-        memory: 2Gi
-  listeners:
-    client:
-      protocol: PLAINTEXT
-      containerPort: 9092
-    controller:
-      protocol: "PLAINTEXT"
-  broker:
-    persistence:
-      size: 20Gi
-    replicaCount: 2
-    resources:
-      requests:
-        cpu: 500m
-        memory: 512Mi
-      limits:
-        cpu: 750m
-        memory: 2Gi
+        cpu: 200m
+        memory: 384Mi
 
 clustersysteminfo:
   enabled: true
@@ -863,11 +846,11 @@ clustersysteminfo:
 haproxy:
   resources:
     requests:
-      cpu: 50m
-      memory: 50Mi
+      cpu: 10m
+      memory: 20Mi
     limits:
-      cpu: 50m
-      memory: 50Mi
+      cpu: 10m
+      memory: 20Mi
   service:
     annotations:
       service.beta.kubernetes.io/aws-load-balancer-backend-protocol: ssl

chart/environment-values/values.openwifi-qa03.yaml

@@ -1,29 +0,0 @@
-
-owgw:
-  services:
-    owgw:
-      annotations:
-        service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
-
-owgwui:
-  ingresses:
-    default:
-      annotations:
-        alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
-
-owprovui:
-  ingresses:
-    default:
-      annotations:
-        alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
-
-owrrm:
-  services:
-    owrrm:
-      annotations:
-        service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
-
-haproxy:
-  service:
-    annotations:
-      service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be

chart/templates/_initdb_sql.tpl

@@ -1,13 +0,0 @@
-{{- define "openwifi.user_creation_script_sql" -}}
-{{- $root := . -}}
-{{- $postgresqlBase := index .Values "postgresql" }}
-{{- $postgresqlEmulatedRoot := (dict "Values" $postgresqlBase "Chart" (dict "Name" "postgresql") "Release" $.Release) }}
-{{ range index .Values "postgresql" "initDbScriptSecret" "services" }}
-CREATE USER {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }};
-ALTER USER {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }} WITH ENCRYPTED PASSWORD '{{ index $root "Values" . "configProperties" "storage.type.postgresql.password" }}';
-CREATE DATABASE {{ index $root "Values" . "configProperties" "storage.type.postgresql.database" }};
-GRANT ALL PRIVILEGES ON DATABASE {{ index $root "Values" . "configProperties" "storage.type.postgresql.database" }} TO {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }};
-ALTER DATABASE {{ index $root "Values" . "configProperties" "storage.type.postgresql.database" }} OWNER TO {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }};
-{{ end }}
-{{- end -}}
-

chart/templates/secret-postgresql-initdb.yaml

@@ -1,5 +1,5 @@
 {{- $root := . -}}
-{{- if index .Values "postgresql-ha" "initDbScriptSecret" "enabled" }}
+{{- if  index .Values "postgresql-ha" "initDbScriptSecret" "enabled" }}
 ---
 apiVersion: v1
 metadata:
@@ -14,18 +14,3 @@ type: Opaque
 data:
   users_creation.sh: {{ include "openwifi.user_creation_script" . | b64enc | quote }}
 {{- end }}
-{{- if index .Values "postgresql" "initDbScriptSecret" "enabled" }}
----
-apiVersion: v1
-metadata:
-  labels:
-    app.kubernetes.io/name: {{ include "openwifi.name" . }}
-    helm.sh/chart: {{ include "openwifi.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "openwifi.fullname" . }}-initdb-scripts
-kind: Secret
-type: Opaque
-data:
-  initdb.sql: {{ include "openwifi.user_creation_script_sql" . | b64enc | quote }}
-{{- end }}

chart/values.yaml

@@ -1,6 +1,7 @@
 # OpenWIFI Gateway (https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/)
 owgw:
   fullnameOverride: owgw
+
   configProperties:
     openwifi.kafka.enable: "true"
     openwifi.kafka.brokerlist: kafka:9092
@@ -8,6 +9,7 @@ owgw:
 # OpenWIFI Security (https://github.com/Telecominfraproject/wlan-cloud-ucentralsec)
 owsec:
   fullnameOverride: owsec
+
   configProperties:
     openwifi.kafka.enable: "true"
     openwifi.kafka.brokerlist: kafka:9092
@@ -15,6 +17,7 @@ owsec:
 # OpenWIFI Firmware (https://github.com/Telecominfraproject/wlan-cloud-ucentralfms)
 owfms:
   fullnameOverride: owfms
+
   configProperties:
     openwifi.kafka.enable: "true"
     openwifi.kafka.brokerlist: kafka:9092
@@ -22,6 +25,7 @@ owfms:
 # OpenWIFI Provisioning (https://github.com/Telecominfraproject/wlan-cloud-owprov/)
 owprov:
   fullnameOverride: owprov
+
   configProperties:
     openwifi.kafka.enable: "true"
     openwifi.kafka.brokerlist: kafka:9092
@@ -29,6 +33,7 @@ owprov:
 # OpenWIFI Analytics (https://github.com/Telecominfraproject/wlan-cloud-analytics)
 owanalytics:
   fullnameOverride: owanalytics
+
   configProperties:
     openwifi.kafka.enable: "true"
     openwifi.kafka.brokerlist: kafka:9092
@@ -44,6 +49,7 @@ owprovui:
 # OpenWIFI Subscription (https://github.com/Telecominfraproject/wlan-cloud-userportal/)
 owsub:
   fullnameOverride: owsub
+
   configProperties:
     openwifi.kafka.enable: "true"
     openwifi.kafka.brokerlist: kafka:9092
@@ -51,22 +57,35 @@ owsub:
 # OpenWIFI radio resource management (https://github.com/Telecominfraproject/wlan-cloud-rrm/)
 owrrm:
   fullnameOverride: owrrm
+
   mysql:
     enabled: true
 
 # kafka (https://github.com/bitnami/charts/blob/master/bitnami/kafka/)
 kafka:
   enabled: true
+
   fullnameOverride: kafka
 
+  image:
+    registry: docker.io
+    repository: bitnami/kafka
+    tag: 2.8.0-debian-10-r43
+
+  minBrokerId: 100
+
+  zookeeper:
+    fullnameOverride: zookeeper
+
 # clustersysteminfo check
 clustersysteminfo:
   enabled: false
   delay: 0 # number of seconds to delay clustersysteminfo execution
+
   images:
     clustersysteminfo:
       repository: tip-tip-wlan-cloud-ucentral.jfrog.io/clustersysteminfo
-      tag: v3.1.0
+      tag: main
       pullPolicy: Always
 #      regcred:
 #        registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -84,17 +103,23 @@ clustersysteminfo:
     # limits:
     #  cpu: 100m
     #  memory: 128Mi
+
   nodeSelector: {}
+
   tolerations: []
+
   affinity: {}
+
   public_env_variables:
     FLAGS: "-s --connect-timeout 3"
     OWSEC: owsec-owsec:16001
     CHECK_RETRIES: 30
+
   secret_env_variables:
     OWSEC_DEFAULT_USERNAME: tip@ucentral.com
     OWSEC_DEFAULT_PASSWORD: openwifi
     #OWSEC_NEW_PASSWORD: "" # Set this value in order for the check to work. Password must comply https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/#authenticationvalidationexpression
+
   activeDeadlineSeconds: 2400
   backoffLimit: 5
   restartPolicy: OnFailure
@@ -102,7 +127,9 @@ clustersysteminfo:
 # OpenWIFI Load Simulator (https://github.com/Telecominfraproject/wlan-cloud-owls)
 owls:
   enabled: false
+
   fullnameOverride: owls
+
   configProperties:
     openwifi.kafka.enable: "true"
     openwifi.kafka.brokerlist: kafka:9092
@@ -110,13 +137,17 @@ owls:
 # OpenWIFI Load Simulator UI (https://github.com/Telecominfraproject/wlan-cloud-owls-ui)
 owlsui:
   enabled: false
+
   fullnameOverride: owlsui
 
 # HAproxy (https://github.com/bitnami/charts/tree/master/bitnami/haproxy)
 haproxy:
   enabled: true
+
   fullnameOverride: proxy
-  replicaCount: 1
+
+  replicaCount: 3
+
   service:
     type: LoadBalancer
     ports:
@@ -397,6 +428,7 @@ haproxy:
 # Cert-manager RESTAPI certs
 restapiCerts:
   enabled: false
+
   services:
     - owgw-owgw
     - owsec-owsec
@@ -406,21 +438,8 @@ restapiCerts:
     - owanalytics-owanalytics
     - owsub-owsub
     - owrrm-owrrm
-  clusterDomain: cluster.local
 
-postgresql:
-  enabled: false
-  nameOverride: pgsql
-  fullnameOverride: pgsql
-  initDbScriptSecret:
-    enabled: false
-    services:
-      - owgw
-      - owsec
-      - owfms
-      - owprov
-      - owanalytics
-      - owsub
+  clusterDomain: cluster.local
 
 postgresql-ha:
   enabled: false

docker-compose/.env

@@ -1,19 +1,19 @@
 # Image tags
 COMPOSE_PROJECT_NAME=openwifi
-OWGW_TAG=v3.1.0
-OWGWUI_TAG=v3.1.0
-OWSEC_TAG=v3.1.0
-OWFMS_TAG=v3.1.0
-OWPROV_TAG=v3.1.0
-OWPROVUI_TAG=v3.1.0
-OWANALYTICS_TAG=v3.1.0
-OWSUB_TAG=v3.1.0
+OWGW_TAG=master
+OWGWUI_TAG=main
+OWSEC_TAG=main
+OWFMS_TAG=main
+OWPROV_TAG=main
+OWPROVUI_TAG=main
+OWANALYTICS_TAG=main
+OWSUB_TAG=main
 KAFKA_TAG=2.8.0-debian-10-r43
 ZOOKEEPER_TAG=3.8
 POSTGRESQL_TAG=15.0
 MYSQL_TAG=latest
 # NOTE currently OWRRM is only supported in LB installations
-#OWRRM_TAG=v2.8.0
+#OWRRM_TAG=main
 
 # Microservice root/config directories
 OWGW_ROOT=/owgw-data

docker-compose/.env.letsencrypt

@@ -1,14 +1,14 @@
 # Image tags
 COMPOSE_PROJECT_NAME=openwifi
-OWGW_TAG=v3.1.0
-OWGWUI_TAG=v3.1.0
-OWSEC_TAG=v3.1.0
-OWFMS_TAG=v3.1.0
-OWPROV_TAG=v3.1.0
-OWPROVUI_TAG=v3.1.0
-OWANALYTICS_TAG=v3.1.0
-OWSUB_TAG=v3.1.0
-OWRRM_TAG=v2.8.0
+OWGW_TAG=master
+OWGWUI_TAG=main
+OWSEC_TAG=main
+OWFMS_TAG=main
+OWPROV_TAG=main
+OWPROVUI_TAG=main
+OWANALYTICS_TAG=main
+OWSUB_TAG=main
+OWRRM_TAG=main
 KAFKA_TAG=2.8.0-debian-10-r43
 ZOOKEEPER_TAG=3.8
 ACMESH_TAG=latest

docker-compose/.env.selfsigned

@@ -1,14 +1,14 @@
 # Image tags
 COMPOSE_PROJECT_NAME=openwifi
-OWGW_TAG=v3.1.0
-OWGWUI_TAG=v3.1.0
-OWSEC_TAG=v3.1.0
-OWFMS_TAG=v3.1.0
-OWPROV_TAG=v3.1.0
-OWPROVUI_TAG=v3.1.0
-OWANALYTICS_TAG=v3.1.0
-OWSUB_TAG=v3.1.0
-OWRRM_TAG=v2.8.0
+OWGW_TAG=master
+OWGWUI_TAG=main
+OWSEC_TAG=main
+OWFMS_TAG=main
+OWPROV_TAG=main
+OWPROVUI_TAG=main
+OWANALYTICS_TAG=main
+OWSUB_TAG=main
+OWRRM_TAG=main
 KAFKA_TAG=2.8.0-debian-10-r43
 ZOOKEEPER_TAG=3.8
 ACMESH_TAG=latest

docker-compose/owanalytics.env

@@ -27,11 +27,12 @@ SYSTEM_URI_UI=https://openwifi.wlan.local
 #KAFKA_ENABLE=true
 KAFKA_BROKERLIST=kafka:9092
 #STORAGE_TYPE=sqlite
-#STORAGE_TYPE_POSTGRESQL_HOST=localhost
-#STORAGE_TYPE_POSTGRESQL_USERNAME=owanalytics
-#STORAGE_TYPE_POSTGRESQL_PASSWORD=owanalytics
-#STORAGE_TYPE_POSTGRESQL_DATABASE=owanalytics
-#STORAGE_TYPE_POSTGRESQL_PORT=5432
+#STORAGE_TYPE=postgresql
+STORAGE_TYPE_POSTGRESQL_HOST=postgresql
+STORAGE_TYPE_POSTGRESQL_USERNAME=owanalytics
+STORAGE_TYPE_POSTGRESQL_PASSWORD=owanalytics
+STORAGE_TYPE_POSTGRESQL_DATABASE=owanalytics
+STORAGE_TYPE_POSTGRESQL_PORT=5432
 #STORAGE_TYPE_MYSQL_HOST=localhost
 #STORAGE_TYPE_MYSQL_USERNAME=owanalytics
 #STORAGE_TYPE_MYSQL_PASSWORD=owanalytics