From 80e5f1d95e1192b0f47f56b5f35c559393fdb688 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Wed, 6 Oct 2021 17:23:08 +0300 Subject: [PATCH 1/6] [WIFI-3295] Add: support for owprov in helm deployments --- .../workflows/test-ucentral-deployment.yaml | 7 +++- .github/workflows/uc_sanity.yml | 1 + .../workflows/ucentralgw-dev-deployment.yaml | 3 ++ .../workflows/ucentralgw-qa-deployment.yaml | 3 ++ helm/ucentral/deploy.sh | 11 ++++++ .../values.ucentral-qa.external-db.yaml | 37 +++++++++++++++++++ helm/ucentral/values.ucentral-qa.yaml | 37 +++++++++++++++++++ 7 files changed, 98 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-ucentral-deployment.yaml b/.github/workflows/test-ucentral-deployment.yaml index cc1ddca68..26375aa12 100644 --- a/.github/workflows/test-ucentral-deployment.yaml +++ b/.github/workflows/test-ucentral-deployment.yaml @@ -29,7 +29,7 @@ on: required: true owgw_version: default: 'master' - description: 'OpenWIFI Gateway version to be deployed (git tag or helm package version may be used, msater is default)' + description: 'OpenWIFI Gateway version to be deployed (git tag or helm package version may be used, master is default)' required: true owgwui_version: default: 'main' @@ -43,6 +43,10 @@ on: default: 'main' description: 'OpenWIFI Firmware version to be deployed (git tag or helm package version may be used, main is default)' required: true + owprov_version: + default: 'main' + description: 'OpenWIFI Provisioning version to be deployed (git tag or helm package version may be used, main is default)' + required: true jobs: deploy: @@ -75,6 +79,7 @@ jobs: export OWGWUI_VERSION=${{ github.event.inputs.owgwui_version }} export OWSEC_VERSION=${{ github.event.inputs.owsec_version }} export OWFMS_VERSION=${{ github.event.inputs.owfms_version }} + export OWPROV_VERSION=${{ github.event.inputs.owprov_version }} export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/.github/workflows/uc_sanity.yml b/.github/workflows/uc_sanity.yml index af20305ec..190905a0f 100644 --- a/.github/workflows/uc_sanity.yml +++ b/.github/workflows/uc_sanity.yml @@ -112,6 +112,7 @@ jobs: export OWGWUI_VERSION=v2.2.0-RC1 export OWSEC_VERSION=v2.2.0-RC1 export OWFMS_VERSION=v2.2.0-RC1 + export OWPROV_VERSION=main export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index e58d3284e..6b3f96525 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -24,6 +24,7 @@ env: # - 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) # - 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) # - 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) testbeds: '[ { @@ -33,6 +34,7 @@ env: "owgw_version": "v2.2.0-RC1", "owsec_version": "v2.2.0-RC1", "owfms_version": "v2.2.0-RC1", + "owprov_version": "main", "owgwui_version": "v2.2.0-RC1" } ]' @@ -86,6 +88,7 @@ jobs: export OWGWUI_VERSION=${{ matrix.owgwui_version }} export OWSEC_VERSION=${{ matrix.owsec_version }} export OWFMS_VERSION=${{ matrix.owfms_version }} + export OWPROV_VERSION=${{ matrix.owprov_version }} export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 28dcf0f86..5c5adb71f 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -24,6 +24,7 @@ env: # - 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) # - 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) # - 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) testbeds: '[ { @@ -33,6 +34,7 @@ env: "owgw_version": "v2.2.0-RC1", "owsec_version": "v2.2.0-RC1", "owfms_version": "v2.2.0-RC1", + "owprov_version": "main", "owgwui_version": "v2.2.0-RC1" } ]' @@ -86,6 +88,7 @@ jobs: export OWGWUI_VERSION=${{ matrix.owgwui_version }} export OWSEC_VERSION=${{ matrix.owsec_version }} export OWFMS_VERSION=${{ matrix.owfms_version }} + export OWPROV_VERSION=${{ matrix.owprov_version }} export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/helm/ucentral/deploy.sh b/helm/ucentral/deploy.sh index 2a9a2743e..5eb83d092 100755 --- a/helm/ucentral/deploy.sh +++ b/helm/ucentral/deploy.sh @@ -13,6 +13,7 @@ usage () { 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)"; 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)"; 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)"; + 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; 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"; 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)"; @@ -34,6 +35,7 @@ usage () { [ -z ${OWGWUI_VERSION+x} ] && echo "OWGWUI_VERSION is unset" && usage && exit 1 [ -z ${OWSEC_VERSION+x} ] && echo "OWSEC_VERSION is unset" && usage && exit 1 [ -z ${OWFMS_VERSION+x} ] && echo "OWFMS_VERSION is unset" && usage && exit 1 +[ -z ${OWPROV_VERSION+x} ] && echo "OWPROV_VERSION is unset" && usage && exit 1 ## Deployment specifics [ -z ${DEPLOY_METHOD+x} ] && echo "DEPLOY_METHOD is unset" && usage && exit 1 [ -z ${CHART_VERSION+x} ] && echo "CHART_VERSION is unset" && usage && exit 1 @@ -52,6 +54,7 @@ export OWGW_VERSION_TAG=$(echo ${OWGW_VERSION} | tr '/' '-') export OWGWUI_VERSION_TAG=$(echo ${OWGWUI_VERSION} | tr '/' '-') export OWSEC_VERSION_TAG=$(echo ${OWSEC_VERSION} | tr '/' '-') export OWFMS_VERSION_TAG=$(echo ${OWFMS_VERSION} | tr '/' '-') +export OWPROV_VERSION_TAG=$(echo ${OWPROV_VERSION} | tr '/' '-') # Check deployment method that's required for this environment helm plugin install https://github.com/databus23/helm-diff || true @@ -66,6 +69,7 @@ if [[ "$DEPLOY_METHOD" == "git" ]]; then 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 helm repo add bitnami https://charts.bitnami.com/bitnami helm repo update helm dependency update @@ -109,6 +113,10 @@ helm upgrade --install --create-namespace --wait --timeout 20m \ --set owfms.configProperties."openwifi\.system\.uri\.public"=https://fms-${NAMESPACE}.cicd.lab.wlan.tip.build:16004 \ --set owfms.configProperties."openwifi\.system\.uri\.private"=https://fms-${NAMESPACE}.cicd.lab.wlan.tip.build:17004 \ --set owfms.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \ + --set owprov.services.owprov.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=prov-${NAMESPACE}.cicd.lab.wlan.tip.build \ + --set owprov.configProperties."openwifi\.system\.uri\.public"=https://prov-${NAMESPACE}.cicd.lab.wlan.tip.build:16005 \ + --set owprov.configProperties."openwifi\.system\.uri\.private"=https://prov-${NAMESPACE}.cicd.lab.wlan.tip.build:17005 \ + --set owprov.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \ --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 \ @@ -119,8 +127,11 @@ helm upgrade --install --create-namespace --wait --timeout 20m \ --set-file owsec.certs."restapi-key\.pem"=$KEY_LOCATION \ --set-file owfms.certs."restapi-cert\.pem"=$CERT_LOCATION \ --set-file owfms.certs."restapi-key\.pem"=$KEY_LOCATION \ + --set-file owprov.certs."restapi-cert\.pem"=$CERT_LOCATION \ + --set-file owprov.certs."restapi-key\.pem"=$KEY_LOCATION \ --set owgw.images.owgw.tag=$OWGW_VERSION_TAG \ --set owgwui.images.owgwui.tag=$OWGWUI_VERSION_TAG \ --set owsec.images.owsec.tag=$OWSEC_VERSION_TAG \ --set owfms.images.owfms.tag=$OWFMS_VERSION_TAG \ + --set owprov.images.owprov.tag=$OWPROV_VERSION_TAG \ tip-openwifi $DEPLOY_SOURCE diff --git a/helm/ucentral/values.ucentral-qa.external-db.yaml b/helm/ucentral/values.ucentral-qa.external-db.yaml index a59303dc8..5d0acfd2d 100644 --- a/helm/ucentral/values.ucentral-qa.external-db.yaml +++ b/helm/ucentral/values.ucentral-qa.external-db.yaml @@ -165,6 +165,43 @@ owfms: 5IOM7ItsRmen6u3qu+JXros54e4juQ== -----END CERTIFICATE----- +owprov: + services: + owprov: + 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: "16105" + 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: "16005,17005" + + 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----- + kafka: heapOpts: -Xmx512m -Xms512m resources: diff --git a/helm/ucentral/values.ucentral-qa.yaml b/helm/ucentral/values.ucentral-qa.yaml index 413f26e60..bee9e3413 100644 --- a/helm/ucentral/values.ucentral-qa.yaml +++ b/helm/ucentral/values.ucentral-qa.yaml @@ -152,6 +152,43 @@ owfms: 5IOM7ItsRmen6u3qu+JXros54e4juQ== -----END CERTIFICATE----- +owprov: + services: + owprov: + 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: "16105" + 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: "16005,17005" + + 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----- + kafka: heapOpts: -Xmx512m -Xms512m resources: From 9bcc301f3650200414b923564e16f6b905dffb52 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Wed, 13 Oct 2021 10:28:29 +0300 Subject: [PATCH 2/6] [WIFI-4909] Add: support for owprovui in helm deployments --- .../workflows/test-ucentral-deployment.yaml | 5 ++++ .github/workflows/uc_sanity.yml | 1 + .../workflows/ucentralgw-dev-deployment.yaml | 5 +++- .../workflows/ucentralgw-qa-deployment.yaml | 5 +++- helm/ucentral/deploy.sh | 8 +++++++ .../values.ucentral-qa.external-db.yaml | 23 +++++++++++++++++++ helm/ucentral/values.ucentral-qa.yaml | 23 +++++++++++++++++++ 7 files changed, 68 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-ucentral-deployment.yaml b/.github/workflows/test-ucentral-deployment.yaml index 26375aa12..876682ec7 100644 --- a/.github/workflows/test-ucentral-deployment.yaml +++ b/.github/workflows/test-ucentral-deployment.yaml @@ -47,6 +47,10 @@ on: default: 'main' description: 'OpenWIFI Provisioning version to be deployed (git tag or helm package version may be used, main is default)' required: true + owprovui_version: + default: 'main' + description: 'OpenWIFI Provisioning Web UI version to be deployed (git tag or helm package version may be used, main is default)' + required: true jobs: deploy: @@ -80,6 +84,7 @@ jobs: export OWSEC_VERSION=${{ github.event.inputs.owsec_version }} export OWFMS_VERSION=${{ github.event.inputs.owfms_version }} export OWPROV_VERSION=${{ github.event.inputs.owprov_version }} + export OWPROVUI_VERSION=${{ github.event.inputs.owprovui_version }} export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/.github/workflows/uc_sanity.yml b/.github/workflows/uc_sanity.yml index 190905a0f..081d81c90 100644 --- a/.github/workflows/uc_sanity.yml +++ b/.github/workflows/uc_sanity.yml @@ -113,6 +113,7 @@ jobs: export OWSEC_VERSION=v2.2.0-RC1 export OWFMS_VERSION=v2.2.0-RC1 export OWPROV_VERSION=main + export OWPROVUI_VERSION=main export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index 6b3f96525..7a852104b 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -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) # - 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: '[ { "namespace": "dev01", @@ -35,7 +36,8 @@ env: "owsec_version": "v2.2.0-RC1", "owfms_version": "v2.2.0-RC1", "owprov_version": "main", - "owgwui_version": "v2.2.0-RC1" + "owgwui_version": "v2.2.0-RC1", + "owprovui_version": "main" } ]' @@ -89,6 +91,7 @@ jobs: export OWSEC_VERSION=${{ matrix.owsec_version }} export OWFMS_VERSION=${{ matrix.owfms_version }} export OWPROV_VERSION=${{ matrix.owprov_version }} + export OWPROVUI_VERSION=${{ matrix.owprovui_version }} export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 5c5adb71f..86d483411 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -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) # - 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: '[ { "namespace": "qa01", @@ -35,7 +36,8 @@ env: "owsec_version": "v2.2.0-RC1", "owfms_version": "v2.2.0-RC1", "owprov_version": "main", - "owgwui_version": "v2.2.0-RC1" + "owgwui_version": "v2.2.0-RC1", + "owprovui_version": "main" } ]' @@ -89,6 +91,7 @@ jobs: export OWSEC_VERSION=${{ matrix.owsec_version }} export OWFMS_VERSION=${{ matrix.owfms_version }} export OWPROV_VERSION=${{ matrix.owprov_version }} + export OWPROVUI_VERSION=${{ matrix.owprovui_version }} export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} diff --git a/helm/ucentral/deploy.sh b/helm/ucentral/deploy.sh index 5eb83d092..9b8dd8c07 100755 --- a/helm/ucentral/deploy.sh +++ b/helm/ucentral/deploy.sh @@ -14,6 +14,7 @@ usage () { 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)"; 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)"; 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; 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"; 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)"; @@ -36,6 +37,7 @@ usage () { [ -z ${OWSEC_VERSION+x} ] && echo "OWSEC_VERSION is unset" && usage && exit 1 [ -z ${OWFMS_VERSION+x} ] && echo "OWFMS_VERSION is unset" && usage && exit 1 [ -z ${OWPROV_VERSION+x} ] && echo "OWPROV_VERSION is unset" && usage && exit 1 +[ -z ${OWPROVUI_VERSION+x} ] && echo "OWPROVUI_VERSION is unset" && usage && exit 1 ## Deployment specifics [ -z ${DEPLOY_METHOD+x} ] && echo "DEPLOY_METHOD is unset" && usage && exit 1 [ -z ${CHART_VERSION+x} ] && echo "CHART_VERSION is unset" && usage && exit 1 @@ -55,6 +57,7 @@ export OWGWUI_VERSION_TAG=$(echo ${OWGWUI_VERSION} | tr '/' '-') export OWSEC_VERSION_TAG=$(echo ${OWSEC_VERSION} | tr '/' '-') export OWFMS_VERSION_TAG=$(echo ${OWFMS_VERSION} | tr '/' '-') export OWPROV_VERSION_TAG=$(echo ${OWPROV_VERSION} | tr '/' '-') +export OWPROVUI_VERSION_TAG=$(echo ${OWPROVUI_VERSION} | tr '/' '-') # Check deployment method that's required for this environment helm plugin install https://github.com/databus23/helm-diff || true @@ -70,6 +73,7 @@ if [[ "$DEPLOY_METHOD" == "git" ]]; then 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 helm repo add bitnami https://charts.bitnami.com/bitnami helm repo update helm dependency update @@ -117,6 +121,9 @@ helm upgrade --install --create-namespace --wait --timeout 20m \ --set owprov.configProperties."openwifi\.system\.uri\.public"=https://prov-${NAMESPACE}.cicd.lab.wlan.tip.build:16005 \ --set owprov.configProperties."openwifi\.system\.uri\.private"=https://prov-${NAMESPACE}.cicd.lab.wlan.tip.build:17005 \ --set owprov.configProperties."openwifi\.system\.uri\.ui"=https://webui-${NAMESPACE}.cicd.lab.wlan.tip.build \ + --set owprovui.ingresses.default.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=provui-${NAMESPACE}.cicd.lab.wlan.tip.build \ + --set owprovui.ingresses.default.hosts={provui-${NAMESPACE}.cicd.lab.wlan.tip.build} \ + --set owprovui.public_env_variables.DEFAULT_UCENTRALSEC_URL=https://sec-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \ --set-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 \ @@ -134,4 +141,5 @@ helm upgrade --install --create-namespace --wait --timeout 20m \ --set owsec.images.owsec.tag=$OWSEC_VERSION_TAG \ --set owfms.images.owfms.tag=$OWFMS_VERSION_TAG \ --set owprov.images.owprov.tag=$OWPROV_VERSION_TAG \ + --set owprovui.images.owprov.tag=$OWPROVUI_VERSION_TAG \ tip-openwifi $DEPLOY_SOURCE diff --git a/helm/ucentral/values.ucentral-qa.external-db.yaml b/helm/ucentral/values.ucentral-qa.external-db.yaml index 5d0acfd2d..941956db5 100644 --- a/helm/ucentral/values.ucentral-qa.external-db.yaml +++ b/helm/ucentral/values.ucentral-qa.external-db.yaml @@ -202,6 +202,29 @@ owprov: 5IOM7ItsRmen6u3qu+JXros54e4juQ== -----END CERTIFICATE----- +owprovui: + services: + owprovui: + type: NodePort + + ingresses: + 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:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285 + alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]' + alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_302"}}' + paths: + - path: /* + serviceName: owprovui + servicePort: http + + public_env_variables: + ALLOW_UCENTRALSEC_CHANGE: false + kafka: heapOpts: -Xmx512m -Xms512m resources: diff --git a/helm/ucentral/values.ucentral-qa.yaml b/helm/ucentral/values.ucentral-qa.yaml index bee9e3413..13a146c40 100644 --- a/helm/ucentral/values.ucentral-qa.yaml +++ b/helm/ucentral/values.ucentral-qa.yaml @@ -189,6 +189,29 @@ owprov: 5IOM7ItsRmen6u3qu+JXros54e4juQ== -----END CERTIFICATE----- +owprovui: + services: + owprovui: + type: NodePort + + ingresses: + 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:us-east-2:289708231103:certificate/bfa89c7a-5b64-4a8a-bcfe-ffec655b5285 + alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]' + alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_302"}}' + paths: + - path: /* + serviceName: owprovui + servicePort: http + + public_env_variables: + ALLOW_UCENTRALSEC_CHANGE: false + kafka: heapOpts: -Xmx512m -Xms512m resources: From 77bd44925c51da5ef2b1ec37c61bc67aa2c3a129 Mon Sep 17 00:00:00 2001 From: jaspreetsachdev Date: Thu, 14 Oct 2021 14:13:35 -0400 Subject: [PATCH 3/6] Move dev to main --- .github/workflows/ucentralgw-dev-deployment.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index e58d3284e..9338dbdbf 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -29,11 +29,11 @@ env: { "namespace": "dev01", "deploy_method": "git", - "chart_version": "v2.2.0-RC1", - "owgw_version": "v2.2.0-RC1", - "owsec_version": "v2.2.0-RC1", - "owfms_version": "v2.2.0-RC1", - "owgwui_version": "v2.2.0-RC1" + "chart_version": "main", + "owgw_version": "master", + "owsec_version": "main", + "owfms_version": "main", + "owgwui_version": "main" } ]' From 7a606f063f17df2541d2ec7c2faba1cc067a50aa Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Fri, 15 Oct 2021 16:25:07 +0300 Subject: [PATCH 4/6] Chg: switch QA instances to mainline versions --- .github/workflows/ucentralgw-qa-deployment.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 86d483411..12b5c7b86 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -31,12 +31,12 @@ env: { "namespace": "qa01", "deploy_method": "git", - "chart_version": "v2.2.0-RC1", - "owgw_version": "v2.2.0-RC1", - "owsec_version": "v2.2.0-RC1", - "owfms_version": "v2.2.0-RC1", + "chart_version": "main", + "owgw_version": "master", + "owsec_version": "main", + "owfms_version": "main", "owprov_version": "main", - "owgwui_version": "v2.2.0-RC1", + "owgwui_version": "main", "owprovui_version": "main" } ]' From a4d0b0d6a7b1a8e0febc9229114bf8a31ed00ee1 Mon Sep 17 00:00:00 2001 From: jaspreetsachdev Date: Fri, 15 Oct 2021 23:54:13 -0400 Subject: [PATCH 5/6] Updated to main/master --- .github/workflows/uc_sanity.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/uc_sanity.yml b/.github/workflows/uc_sanity.yml index 4f70305a9..b285809b1 100644 --- a/.github/workflows/uc_sanity.yml +++ b/.github/workflows/uc_sanity.yml @@ -107,11 +107,11 @@ jobs: run: | export NAMESPACE=${{ github.run_id }} export DEPLOY_METHOD=git - export CHART_VERSION=v2.2.0-RC1 - export OWGW_VERSION=v2.2.0-RC1 - export OWGWUI_VERSION=v2.2.0-RC1 - export OWSEC_VERSION=v2.2.0-RC1 - export OWFMS_VERSION=v2.2.0-RC1 + export CHART_VERSION=main + export OWGW_VERSION=master + export OWGWUI_VERSION=main + export OWSEC_VERSION=main + export OWFMS_VERSION=main export OWPROV_VERSION=main export OWPROVUI_VERSION=main export VALUES_FILE_LOCATION=values.ucentral-qa.yaml From f72bbdd33d815eae6cc17760327f57d6ea6af31d Mon Sep 17 00:00:00 2001 From: jaspreetsachdev Date: Sat, 16 Oct 2021 11:59:31 -0400 Subject: [PATCH 6/6] increased the timeout --- .github/workflows/uc_sanity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uc_sanity.yml b/.github/workflows/uc_sanity.yml index b285809b1..11db2d8e9 100644 --- a/.github/workflows/uc_sanity.yml +++ b/.github/workflows/uc_sanity.yml @@ -144,7 +144,7 @@ jobs: kubectl describe persistentvolumeclaims --namespace openwifi-${{ github.run_id }} - name: wait for DNS to propagate - run: sleep 300 + run: sleep 900 generate-matrix: name: generate testbed matrix