mirror of
https://github.com/Telecominfraproject/wlan-testing.git
synced 2025-11-01 19:37:54 +00:00
[WIFI-7221] Add: owsub support (#449)
Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
This commit is contained in:
Dmitry Dunaev
28
.github/workflows/ow_docker-compose.yml
vendored
28
.github/workflows/ow_docker-compose.yml
vendored
@@ -41,6 +41,10 @@ on:
|
||||
default: 'main'
|
||||
description: 'OpenWIFI Analytics version to be deployed.'
|
||||
required: false
|
||||
owsub_version:
|
||||
default: 'main'
|
||||
description: 'OpenWIFI Subscription (Userportal) version to be deployed.'
|
||||
required: false
|
||||
id:
|
||||
description: 'run identifier'
|
||||
required: false
|
||||
@@ -130,7 +134,7 @@ jobs:
|
||||
external-dns.alpha.kubernetes.io/hostname: ow-docker-compose-${{ github.run_id }}.cicd.lab.wlan.tip.build
|
||||
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: ssl
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16002,16003,443,16001,16004,16005,8443,5912,5913"
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16002,16003,443,16001,16004,16005,8443,5912,5913,16009,16006"
|
||||
labels:
|
||||
app: ow-docker-compose-${{ github.run_id }}
|
||||
spec:
|
||||
@@ -168,6 +172,7 @@ jobs:
|
||||
- name: owgw-ui-https
|
||||
port: 443
|
||||
targetPort: 443
|
||||
protocol: TCP
|
||||
- name: owsec-restapi
|
||||
port: 16001
|
||||
targetPort: 16001
|
||||
@@ -175,6 +180,7 @@ jobs:
|
||||
- name: owsec-alivecheck
|
||||
port: 16101
|
||||
targetPort: 16101
|
||||
protocol: TCP
|
||||
- name: owfms-restapi
|
||||
port: 16004
|
||||
targetPort: 16004
|
||||
@@ -182,6 +188,7 @@ jobs:
|
||||
- name: owfms-alivecheck
|
||||
port: 16104
|
||||
targetPort: 16104
|
||||
protocol: TCP
|
||||
- name: owprov-restapi
|
||||
port: 16005
|
||||
targetPort: 16005
|
||||
@@ -189,6 +196,7 @@ jobs:
|
||||
- name: owprov-alivecheck
|
||||
port: 16105
|
||||
targetPort: 16105
|
||||
protocol: TCP
|
||||
- name: owprov-ui-http
|
||||
port: 8080
|
||||
targetPort: 8080
|
||||
@@ -196,6 +204,7 @@ jobs:
|
||||
- name: owprov-ui-https
|
||||
port: 8443
|
||||
targetPort: 8443
|
||||
protocol: TCP
|
||||
- name: owanalytics-restapi
|
||||
port: 16009
|
||||
targetPort: 16009
|
||||
@@ -203,6 +212,15 @@ jobs:
|
||||
- name: owanalytics-alivecheck
|
||||
port: 16109
|
||||
targetPort: 16109
|
||||
protocol: TCP
|
||||
- name: owsub-restapi
|
||||
port: 16006
|
||||
targetPort: 16006
|
||||
protocol: TCP
|
||||
- name: owsub-alivecheck
|
||||
port: 16106
|
||||
targetPort: 16106
|
||||
protocol: TCP
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
@@ -262,6 +280,8 @@ jobs:
|
||||
value: "${{ github.event.inputs.owprovui_version }}"
|
||||
- name: OWANALYTICS_TAG
|
||||
value: "${{ github.event.inputs.owanalytics_version }}"
|
||||
- name: OWSUB_TAG
|
||||
value: "${{ github.event.inputs.owsub_version }}"
|
||||
- name: INTERNAL_OWGW_HOSTNAME
|
||||
value: "owgw.wlan.local"
|
||||
- name: INTERNAL_OWSEC_HOSTNAME
|
||||
@@ -272,6 +292,8 @@ jobs:
|
||||
value: "owprov.wlan.local"
|
||||
- name: INTERNAL_OWANALYTICS_HOSTNAME
|
||||
value: "owanalytics.wlan.local"
|
||||
- name: INTERNAL_OWSUB_HOSTNAME
|
||||
value: "owsub.wlan.local"
|
||||
- name: SYSTEM_URI_UI
|
||||
value: "https://ow-docker-compose-${{ github.run_id }}.cicd.lab.wlan.tip.build"
|
||||
- name: DEFAULT_UCENTRALSEC_URL
|
||||
@@ -310,6 +332,10 @@ jobs:
|
||||
value: "https://owanalytics.wlan.local:17009"
|
||||
- name: OWANALYTICS_SYSTEM_URI_PUBLIC
|
||||
value: "https://ow-docker-compose-${{ github.run_id }}.cicd.lab.wlan.tip.build:16009"
|
||||
- name: OWSUB_SYSTEM_URI_PRIVATE
|
||||
value: "https://owsub.wlan.local:17006"
|
||||
- name: OWSUB_SYSTEM_URI_PUBLIC
|
||||
value: "https://ow-docker-compose-${{ github.run_id }}.cicd.lab.wlan.tip.build:16006"
|
||||
- name: WEBSOCKET_CERT
|
||||
value: "/tip-cicd-wildcard-certs/websocket-cert.pem"
|
||||
- name: WEBSOCKET_KEY
|
||||
|
||||
4
.github/workflows/quali-advanced.yml
vendored
4
.github/workflows/quali-advanced.yml
vendored
@@ -174,6 +174,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/analytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: stop reservation
|
||||
if: always()
|
||||
run: python .quali/stop_reservation.py ${{ steps.reservation.outputs.identifier }}
|
||||
|
||||
36
.github/workflows/quali.yml
vendored
36
.github/workflows/quali.yml
vendored
@@ -173,6 +173,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -278,6 +282,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -383,6 +391,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -488,6 +500,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -593,6 +609,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -698,6 +718,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -803,6 +827,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -908,6 +936,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
@@ -1013,6 +1045,10 @@ jobs:
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
|
||||
|
||||
- name: show subscription (userportal) logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
|
||||
|
||||
- name: show sec logs
|
||||
if: failure()
|
||||
run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
|
||||
|
||||
@@ -55,6 +55,10 @@ on:
|
||||
default: 'main'
|
||||
description: 'OpenWIFI Analytics version to be deployed (git tag or helm package version may be used, main is default)'
|
||||
required: true
|
||||
owsub_version:
|
||||
default: 'main'
|
||||
description: 'OpenWIFI Subscription (Userportal) version to be deployed (git tag or helm package version may be used, main is default)'
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
@@ -90,6 +94,7 @@ jobs:
|
||||
export OWPROV_VERSION=${{ github.event.inputs.owprov_version }}
|
||||
export OWPROVUI_VERSION=${{ github.event.inputs.owprovui_version }}
|
||||
export OWANALYTICS_VERSION=${{ github.event.inputs.owanalytics_version }}
|
||||
export OWSUB_VERSION=${{ github.event.inputs.owsub_version }}
|
||||
export VALUES_FILE_LOCATION=values.ucentral-qa.yaml
|
||||
export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
|
||||
export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
|
||||
|
||||
23
.github/workflows/uc_loadsim.yml
vendored
23
.github/workflows/uc_loadsim.yml
vendored
@@ -82,6 +82,7 @@ jobs:
|
||||
export OWPROV_VERSION=main
|
||||
export OWPROVUI_VERSION=main
|
||||
export OWANALYTICS_VERSION=main
|
||||
export OWSUB_VERSION=main
|
||||
export VALUES_FILE_LOCATION=values.ucentral-qa.yaml,values.ucentral-qa.test-nodes.yaml,values.ucentral-qa.owls-enabled.yaml
|
||||
export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
|
||||
export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
|
||||
@@ -383,7 +384,7 @@ jobs:
|
||||
external-dns.alpha.kubernetes.io/hostname: ${{ steps.cloudsdk.outputs.url }}
|
||||
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: ssl
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16002,16003,443,16001,16004,16005,8443,5912,5913"
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16002,16003,443,16001,16004,16005,8443,5912,5913,16009,16006"
|
||||
labels:
|
||||
app: cloudsdk
|
||||
spec:
|
||||
@@ -421,6 +422,7 @@ jobs:
|
||||
- name: owgw-ui-https
|
||||
port: 443
|
||||
targetPort: 443
|
||||
protocol: TCP
|
||||
- name: owsec-restapi
|
||||
port: 16001
|
||||
targetPort: 16001
|
||||
@@ -428,6 +430,7 @@ jobs:
|
||||
- name: owsec-alivecheck
|
||||
port: 16101
|
||||
targetPort: 16101
|
||||
protocol: TCP
|
||||
- name: owfms-restapi
|
||||
port: 16004
|
||||
targetPort: 16004
|
||||
@@ -435,6 +438,7 @@ jobs:
|
||||
- name: owfms-alivecheck
|
||||
port: 16104
|
||||
targetPort: 16104
|
||||
protocol: TCP
|
||||
- name: owprov-restapi
|
||||
port: 16005
|
||||
targetPort: 16005
|
||||
@@ -442,6 +446,7 @@ jobs:
|
||||
- name: owprov-alivecheck
|
||||
port: 16105
|
||||
targetPort: 16105
|
||||
protocol: TCP
|
||||
- name: owprov-ui-http
|
||||
port: 8080
|
||||
targetPort: 8080
|
||||
@@ -449,6 +454,7 @@ jobs:
|
||||
- name: owprov-ui-https
|
||||
port: 8443
|
||||
targetPort: 8443
|
||||
protocol: TCP
|
||||
- name: owanalytics-restapi
|
||||
port: 16009
|
||||
targetPort: 16009
|
||||
@@ -456,6 +462,15 @@ jobs:
|
||||
- name: owanalytics-alivecheck
|
||||
port: 16109
|
||||
targetPort: 16109
|
||||
protocol: TCP
|
||||
- name: owsub-restapi
|
||||
port: 16006
|
||||
targetPort: 16006
|
||||
protocol: TCP
|
||||
- name: owsub-alivecheck
|
||||
port: 16106
|
||||
targetPort: 16106
|
||||
protocol: TCP
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
@@ -522,6 +537,8 @@ jobs:
|
||||
value: "owprov.wlan.local"
|
||||
- name: INTERNAL_OWANALYTICS_HOSTNAME
|
||||
value: "owanalytics.wlan.local"
|
||||
- name: INTERNAL_OWSUB_HOSTNAME
|
||||
value: "owsub.wlan.local"
|
||||
- name: DEPLOY_VERSION
|
||||
value: "${{ github.event.inputs.sdk_version }}"
|
||||
- name: SYSTEM_URI_UI
|
||||
@@ -562,6 +579,10 @@ jobs:
|
||||
value: "https://owanalytics.wlan.local:17009"
|
||||
- name: OWANALYTICS_SYSTEM_URI_PUBLIC
|
||||
value: "https://${{ steps.cloudsdk.outputs.url }}:16009"
|
||||
- name: OWSUB_SYSTEM_URI_PRIVATE
|
||||
value: "https://owsub.wlan.local:17006"
|
||||
- name: OWSUB_SYSTEM_URI_PUBLIC
|
||||
value: "https://ow-docker-compose-${{ github.run_id }}.cicd.lab.wlan.tip.build:16006"
|
||||
- name: WEBSOCKET_CERT
|
||||
value: "/tip-cicd-wildcard-certs/websocket-cert.pem"
|
||||
- name: WEBSOCKET_KEY
|
||||
|
||||
@@ -26,6 +26,7 @@ env:
|
||||
# - 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)
|
||||
# - 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)
|
||||
# - 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)
|
||||
# - 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)
|
||||
testbeds: '[
|
||||
@@ -38,6 +39,7 @@ env:
|
||||
"owfms_version": "main",
|
||||
"owprov_version": "main",
|
||||
"owanalytics_version": "main",
|
||||
"owsub_version": "main",
|
||||
"owgwui_version": "main",
|
||||
"owprovui_version": "main"
|
||||
}
|
||||
@@ -95,6 +97,7 @@ jobs:
|
||||
export OWPROV_VERSION=${{ matrix.owprov_version }}
|
||||
export OWPROVUI_VERSION=${{ matrix.owprovui_version }}
|
||||
export OWANALYTICS_VERSION=${{ matrix.owanalytics_version }}
|
||||
export OWSUB_VERSION=${{ matrix.owsub_version }}
|
||||
export VALUES_FILE_LOCATION=values.ucentral-qa.yaml
|
||||
export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
|
||||
export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
|
||||
|
||||
@@ -26,6 +26,7 @@ env:
|
||||
# - 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)
|
||||
# - 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)
|
||||
# - 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)
|
||||
# - 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)
|
||||
testbeds: '[
|
||||
@@ -38,6 +39,7 @@ env:
|
||||
"owfms_version": "v2.5.0-RC1",
|
||||
"owprov_version": "v2.5.0-RC1",
|
||||
"owanalytics_version": "main",
|
||||
"owsub_version": "main",
|
||||
"owgwui_version": "v2.5.0-RC1",
|
||||
"owprovui_version": "v2.5.0-RC1"
|
||||
},
|
||||
@@ -50,6 +52,7 @@ env:
|
||||
"owfms_version": "v2.5.0-RC1",
|
||||
"owprov_version": "v2.5.0-RC1",
|
||||
"owanalytics_version": "main",
|
||||
"owsub_version": "main",
|
||||
"owgwui_version": "v2.5.0-RC1",
|
||||
"owprovui_version": "v2.5.0-RC1"
|
||||
}
|
||||
@@ -107,6 +110,7 @@ jobs:
|
||||
export OWPROV_VERSION=${{ matrix.owprov_version }}
|
||||
export OWPROVUI_VERSION=${{ matrix.owprovui_version }}
|
||||
export OWANALYTICS_VERSION=${{ matrix.owanalytics_version }}
|
||||
export OWSUB_VERSION=${{ matrix.owsub_version }}
|
||||
export VALUES_FILE_LOCATION=values.ucentral-qa.yaml
|
||||
export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
|
||||
export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
|
||||
|
||||
@@ -18,6 +18,7 @@ usage () {
|
||||
echo "- INTERNAL_OWFMS_HOSTNAME - OWFms microservice hostname for Docker internal communication"
|
||||
echo "- INTERNAL_OWPROV_HOSTNAME - OWProv microservice hostname for Docker internal communication"
|
||||
echo "- INTERNAL_OWANALYTICS_HOSTNAME - OWAnalytics microservice hostname for Docker internal communication"
|
||||
echo "- INTERNAL_OWSUB_HOSTNAME - OWSub microservice hostname for Docker internal communication"
|
||||
echo;
|
||||
echo "- OWGW_FILEUPLOADER_HOST_NAME - hostname to be used for OWGW fileupload";
|
||||
echo "- OWGW_FILEUPLOADER_URI - URL to be used for OWGW fileupload";
|
||||
@@ -41,6 +42,9 @@ usage () {
|
||||
echo "- OWANALYTICS_SYSTEM_URI_PRIVATE - private URL to be used for OWAnalytics";
|
||||
echo "- OWANALYTICS_SYSTEM_URI_PUBLIC - public URL to be used for OWAnalytics";
|
||||
echo;
|
||||
echo "- OWSUB_SYSTEM_URI_PRIVATE - private URL to be used for OWSub";
|
||||
echo "- OWSUB_SYSTEM_URI_PUBLIC - public URL to be used for OWSub";
|
||||
echo;
|
||||
echo "- WEBSOCKET_CERT - path to the websocket certificate";
|
||||
echo "- WEBSOCKET_KEY - path to the websocket key";
|
||||
}
|
||||
@@ -57,6 +61,7 @@ usage () {
|
||||
[ -z ${INTERNAL_OWFMS_HOSTNAME+x} ] && echo "INTERNAL_OWFMS_HOSTNAME is unset" && usage && exit 1
|
||||
[ -z ${INTERNAL_OWPROV_HOSTNAME+x} ] && echo "INTERNAL_OWPROV_HOSTNAME is unset" && usage && exit 1
|
||||
[ -z ${INTERNAL_OWANALYTICS_HOSTNAME+x} ] && echo "INTERNAL_OWANALYTICS_HOSTNAME is unset" && usage && exit 1
|
||||
[ -z ${INTERNAL_OWSUB_HOSTNAME+x} ] && echo "INTERNAL_OWSUB_HOSTNAME is unset" && usage && exit 1
|
||||
## OWGW configuration variables
|
||||
[ -z ${OWGW_FILEUPLOADER_HOST_NAME+x} ] && echo "OWGW_FILEUPLOADER_HOST_NAME is unset" && usage && exit 1
|
||||
[ -z ${OWGW_FILEUPLOADER_URI+x} ] && echo "OWGW_FILEUPLOADER_URI is unset" && usage && exit 1
|
||||
@@ -79,6 +84,9 @@ usage () {
|
||||
## OWAnalytics configuration variables
|
||||
[ -z ${OWANALYTICS_SYSTEM_URI_PRIVATE+x} ] && echo "OWANALYTICS_SYSTEM_URI_PRIVATE is unset" && usage && exit 1
|
||||
[ -z ${OWANALYTICS_SYSTEM_URI_PUBLIC+x} ] && echo "OWANALYTICS_SYSTEM_URI_PUBLIC is unset" && usage && exit 1
|
||||
## OWSub configuration variables
|
||||
[ -z ${OWSUB_SYSTEM_URI_PRIVATE+x} ] && echo "OWSUB_SYSTEM_URI_PRIVATE is unset" && usage && exit 1
|
||||
[ -z ${OWSUB_SYSTEM_URI_PUBLIC+x} ] && echo "OWSUB_SYSTEM_URI_PUBLIC is unset" && usage && exit 1
|
||||
## cert related variables
|
||||
[ -z ${WEBSOCKET_CERT+x} ] && echo "WEBSOCKET_CERT is unset" && usage && exit 1
|
||||
[ -z ${WEBSOCKET_KEY+x} ] && echo "WEBSOCKET_KEY is unset" && usage && exit 1
|
||||
@@ -95,6 +103,7 @@ sed -i "s~\(^INTERNAL_OWSEC_HOSTNAME=\).*~\1$INTERNAL_OWSEC_HOSTNAME~" .env
|
||||
sed -i "s~\(^INTERNAL_OWFMS_HOSTNAME=\).*~\1$INTERNAL_OWFMS_HOSTNAME~" .env
|
||||
sed -i "s~\(^INTERNAL_OWPROV_HOSTNAME=\).*~\1$INTERNAL_OWPROV_HOSTNAME~" .env
|
||||
sed -i "s~\(^INTERNAL_OWANALYTICS_HOSTNAME=\).*~\1$INTERNAL_OWANALYTICS_HOSTNAME~" .env
|
||||
sed -i "s~\(^INTERNAL_OWSUB_HOSTNAME=\).*~\1$INTERNAL_OWSUB_HOSTNAME~" .env
|
||||
|
||||
sed -i "s~\(^FILEUPLOADER_HOST_NAME=\).*~\1$OWGW_FILEUPLOADER_HOST_NAME~" owgw.env
|
||||
sed -i "s~\(^FILEUPLOADER_URI=\).*~\1$OWGW_FILEUPLOADER_URI~" owgw.env
|
||||
@@ -132,6 +141,10 @@ sed -i "s~\(^SYSTEM_URI_PRIVATE=\).*~\1$OWANALYTICS_SYSTEM_URI_PRIVATE~" owanaly
|
||||
sed -i "s~\(^SYSTEM_URI_PUBLIC=\).*~\1$OWANALYTICS_SYSTEM_URI_PUBLIC~" owanalytics.env
|
||||
sed -i "s~\(^SYSTEM_URI_UI=\).*~\1$SYSTEM_URI_UI~" owanalytics.env
|
||||
|
||||
sed -i "s~\(^SYSTEM_URI_PRIVATE=\).*~\1$OWSUB_SYSTEM_URI_PRIVATE~" owsub.env
|
||||
sed -i "s~\(^SYSTEM_URI_PUBLIC=\).*~\1$OWSUB_SYSTEM_URI_PUBLIC~" owsub.env
|
||||
sed -i "s~\(^SYSTEM_URI_UI=\).*~\1$SYSTEM_URI_UI~" owsub.env
|
||||
|
||||
# Run the deployment and attach to logs
|
||||
cat $WEBSOCKET_CERT > certs/websocket-cert.pem
|
||||
cat $WEBSOCKET_KEY > certs/websocket-key.pem
|
||||
|
||||
@@ -30,6 +30,7 @@ usage () {
|
||||
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)";
|
||||
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)";
|
||||
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)";
|
||||
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)";
|
||||
echo;
|
||||
echo "Optional environment variables:"
|
||||
echo;
|
||||
@@ -68,6 +69,7 @@ else
|
||||
[ -z ${OWPROV_VERSION+x} ] && echo "OWPROV_VERSION is unset" && usage && exit 1
|
||||
[ -z ${OWPROVUI_VERSION+x} ] && echo "OWPROVUI_VERSION is unset" && usage && exit 1
|
||||
[ -z ${OWANALYTICS_VERSION+x} ] && echo "OWANALYTICS_VERSION is unset" && usage && exit 1
|
||||
[ -z ${OWSUB_VERSION+x} ] && echo "OWSUB_VERSION is unset" && usage && exit 1
|
||||
fi
|
||||
## Environment specifics
|
||||
[ -z ${NAMESPACE+x} ] && echo "NAMESPACE is unset" && usage && exit 1
|
||||
@@ -92,6 +94,7 @@ export OWFMS_VERSION_TAG=$(echo ${OWFMS_VERSION} | tr '/' '-')
|
||||
export OWPROV_VERSION_TAG=$(echo ${OWPROV_VERSION} | tr '/' '-')
|
||||
export OWPROVUI_VERSION_TAG=$(echo ${OWPROVUI_VERSION} | tr '/' '-')
|
||||
export OWANALYTICS_VERSION_TAG=$(echo ${OWANALYTICS_VERSION} | tr '/' '-')
|
||||
export OWSUB_VERSION_TAG=$(echo ${OWSUB_VERSION} | tr '/' '-')
|
||||
|
||||
# Debug get bash version
|
||||
bash --version > /dev/stderr
|
||||
@@ -113,6 +116,7 @@ if [[ "$DEPLOY_METHOD" == "git" ]]; then
|
||||
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
|
||||
fi
|
||||
helm repo add bitnami https://charts.bitnami.com/bitnami
|
||||
helm repo update
|
||||
@@ -141,10 +145,10 @@ for EXTRA_VALUE in ${EXTRA_VALUES_SPLITTED[*]}; do
|
||||
done
|
||||
|
||||
if [[ "$USE_SEPARATE_OWGW_LB" == "true" ]]; then
|
||||
export HAPROXY_SERVICE_DNS_RECORDS="sec-${NAMESPACE}.cicd.lab.wlan.tip.build\,fms-${NAMESPACE}.cicd.lab.wlan.tip.build\,prov-${NAMESPACE}.cicd.lab.wlan.tip.build\,analytics-${NAMESPACE}.cicd.lab.wlan.tip.build"
|
||||
export HAPROXY_SERVICE_DNS_RECORDS="sec-${NAMESPACE}.cicd.lab.wlan.tip.build\,fms-${NAMESPACE}.cicd.lab.wlan.tip.build\,prov-${NAMESPACE}.cicd.lab.wlan.tip.build\,analytics-${NAMESPACE}.cicd.lab.wlan.tip.build\,sub-${NAMESPACE}.cicd.lab.wlan.tip.build"
|
||||
export OWGW_SERVICE_DNS_RECORDS="gw-${NAMESPACE}.cicd.lab.wlan.tip.build"
|
||||
else
|
||||
export HAPROXY_SERVICE_DNS_RECORDS="gw-${NAMESPACE}.cicd.lab.wlan.tip.build\,sec-${NAMESPACE}.cicd.lab.wlan.tip.build\,fms-${NAMESPACE}.cicd.lab.wlan.tip.build\,prov-${NAMESPACE}.cicd.lab.wlan.tip.build\,analytics-${NAMESPACE}.cicd.lab.wlan.tip.build"
|
||||
export HAPROXY_SERVICE_DNS_RECORDS="gw-${NAMESPACE}.cicd.lab.wlan.tip.build\,sec-${NAMESPACE}.cicd.lab.wlan.tip.build\,fms-${NAMESPACE}.cicd.lab.wlan.tip.build\,prov-${NAMESPACE}.cicd.lab.wlan.tip.build\,analytics-${NAMESPACE}.cicd.lab.wlan.tip.build\,sub-${NAMESPACE}.cicd.lab.wlan.tip.build"
|
||||
export OWGW_SERVICE_DNS_RECORDS=""
|
||||
fi
|
||||
|
||||
@@ -189,6 +193,11 @@ helm upgrade --install --create-namespace --wait --timeout 60m \
|
||||
--set owanalytics.configProperties."openwifi\.system\.uri\.private"=https://owanalytics-owanalytics:17009 \
|
||||
--set owanalytics.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \
|
||||
--set owanalytics.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
|
||||
--set owsub.services.owsub.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=sub-${NAMESPACE}.cicd.lab.wlan.tip.build \
|
||||
--set owsub.configProperties."openwifi\.system\.uri\.public"=https://sub-${NAMESPACE}.cicd.lab.wlan.tip.build:16006 \
|
||||
--set owsub.configProperties."openwifi\.system\.uri\.private"=https://owsub-owsub:17006 \
|
||||
--set owsub.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \
|
||||
--set owsub.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
|
||||
--set clustersysteminfo.public_env_variables.OWSEC=sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
|
||||
--set clustersysteminfo.secret_env_variables.OWSEC_NEW_PASSWORD=${OWSEC_NEW_PASSWORD} \
|
||||
--set owls.services.owls.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=ls-${NAMESPACE}.cicd.lab.wlan.tip.build \
|
||||
@@ -217,4 +226,6 @@ helm upgrade --install --create-namespace --wait --timeout 60m \
|
||||
--set-file owls.certs."device-key\.pem"=$DEVICE_KEY_LOCATION \
|
||||
--set-file owanalytics.certs."restapi-cert\.pem"=$CERT_LOCATION \
|
||||
--set-file owanalytics.certs."restapi-key\.pem"=$KEY_LOCATION \
|
||||
--set-file owsub.certs."restapi-cert\.pem"=$CERT_LOCATION \
|
||||
--set-file owsub.certs."restapi-key\.pem"=$KEY_LOCATION \
|
||||
tip-openwifi $DEPLOY_SOURCE
|
||||
|
||||
@@ -58,5 +58,17 @@ owanalytics:
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16009,17009"
|
||||
|
||||
owsub:
|
||||
services:
|
||||
owsub:
|
||||
type: LoadBalancer
|
||||
annotations:
|
||||
service.beta.kubernetes.io/aws-load-balancer-type: "nlb-ip"
|
||||
service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
|
||||
service.beta.kubernetes.io/aws-load-balancer-healthcheck-port: "16106"
|
||||
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: ssl
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285"
|
||||
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16006,17006"
|
||||
|
||||
haproxy:
|
||||
enabled: false
|
||||
|
||||
@@ -494,6 +494,92 @@ owanalytics:
|
||||
secret:
|
||||
secretName: {{ include "owanalytics.fullname" . }}-owanalytics-restapi-tls
|
||||
|
||||
owsub:
|
||||
checks:
|
||||
owsub:
|
||||
readiness:
|
||||
exec:
|
||||
command: ["true"]
|
||||
|
||||
resources:
|
||||
requests:
|
||||
cpu: 10m
|
||||
memory: 100Mi
|
||||
limits:
|
||||
cpu: 100m
|
||||
memory: 500Mi
|
||||
|
||||
podAnnotations:
|
||||
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
|
||||
|
||||
certs:
|
||||
restapi-ca.pem: |
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDojCCAoqgAwIBAgIUPVYBpqNbcLYygF6Mx+qxSWwQyFowDQYJKoZIhvcNAQEL
|
||||
BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
|
||||
dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
|
||||
b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjQyNDRaFw0zMTA0MTMyMjM4NDZaMGkx
|
||||
CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
|
||||
Yy4xDDAKBgNVBAsTA1RJUDEmMCQGA1UEAxMdVGVsZWNvbSBJbmZyYSBQcm9qZWN0
|
||||
IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIGCibwf5u
|
||||
AAwZ+1H8U0e3u2V+0d2gSctucoK86XwUmfe1V2a/qlCYZd29r80IuN1IIeB0naIm
|
||||
KnK/MzXW87clF6tFd1+HzEvmlY/W4KyIXalVCTEzirFSvBEG2oZpM0yC3AefytAO
|
||||
aOpA00LaM3xTfTqMKIRhJBuLy0I4ANUVG6ixVebbGuc78IodleqiLoWy2Q9QHyEO
|
||||
t/7hZndJhiVogh0PveRhho45EbsACu7ymDY+JhlIleevqwlE3iQoq0YcmYADHno6
|
||||
Eq8vcwLpZFxihupUafkd1T3WJYQAJf9coCjBu2qIhNgrcrGD8R9fGswwNRzMRMpX
|
||||
720+GjcDW3bJAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAJG
|
||||
lmB5sVP2qfL3xZ8hQOTpkQH6MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
|
||||
AAOCAQEAVjl9dm4epG9NUYnagT9sg7scVQEPfz3Lt6w1NXJXgD8mAUlK0jXmEyvM
|
||||
dCPD4514n+8+lM7US8fh+nxc7jO//LwK17Wm9FblgjNFR7+anv0Q99T9fP19DLlF
|
||||
PSNHL2emogy1bl1lLTAoj8nxg2wVKPDSHBGviQ5LR9fsWUIJDv9Bs5k0qWugWYSj
|
||||
19S6qnHeskRDB8MqRLhKMG82oDVLerSnhD0P6HjySBHgTTU7/tYS/OZr1jI6MPbG
|
||||
L+/DtiR5fDVMNdBSGU89UNTi0wHY9+RFuNlIuvZC+x/swF0V9R5mN+ywquTPtDLA
|
||||
5IOM7ItsRmen6u3qu+JXros54e4juQ==
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
public_env_variables:
|
||||
SELFSIGNED_CERTS: "true"
|
||||
|
||||
configProperties:
|
||||
openwifi.internal.restapi.host.0.rootca: $OWSUB_ROOT/certs/restapi-certs/ca.crt
|
||||
openwifi.internal.restapi.host.0.cert: $OWSUB_ROOT/certs/restapi-certs/tls.crt
|
||||
openwifi.internal.restapi.host.0.key: $OWSUB_ROOT/certs/restapi-certs/tls.key
|
||||
openwifi.restapi.host.0.rootca: $OWSUB_ROOT/certs/restapi-certs/ca.crt
|
||||
openwifi.restapi.host.0.cert: $OWSUB_ROOT/certs/restapi-certs/tls.crt
|
||||
openwifi.restapi.host.0.key: $OWSUB_ROOT/certs/restapi-certs/tls.key
|
||||
|
||||
volumes:
|
||||
owsub:
|
||||
- name: config
|
||||
mountPath: /owsub-data/owsub.properties
|
||||
subPath: owsub.properties
|
||||
# Template below will be rendered in template
|
||||
volumeDefinition: |
|
||||
secret:
|
||||
secretName: {{ include "owsub.fullname" . }}-config
|
||||
- name: certs
|
||||
mountPath: /owsub-data/certs
|
||||
volumeDefinition: |
|
||||
secret:
|
||||
secretName: {{ include "owsub.fullname" . }}-certs
|
||||
- name: persist
|
||||
mountPath: /owsub-data/persist
|
||||
volumeDefinition: |
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ template "owsub.fullname" . }}-pvc
|
||||
|
||||
- name: restapi-certs
|
||||
mountPath: /owsub-data/certs/restapi-certs
|
||||
volumeDefinition: |
|
||||
secret:
|
||||
secretName: {{ include "owsub.fullname" . }}-owsub-restapi-tls
|
||||
- name: restapi-ca
|
||||
mountPath: /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
|
||||
subPath: ca.crt
|
||||
volumeDefinition: |
|
||||
secret:
|
||||
secretName: {{ include "owsub.fullname" . }}-owsub-restapi-tls
|
||||
|
||||
|
||||
kafka:
|
||||
commonAnnotations:
|
||||
|
||||
Reference in New Issue
Block a user