diff --git a/.github/workflows/ucentralgw-demo-deployment.yaml b/.github/workflows/ucentralgw-demo-deployment.yaml index 7553d304b..7a484cbd3 100644 --- a/.github/workflows/ucentralgw-demo-deployment.yaml +++ b/.github/workflows/ucentralgw-demo-deployment.yaml @@ -12,9 +12,8 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CLIENT_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CLIENT_KEY }} - # DigiCert certs - DIGICERT_CERT: ${{ secrets.DIGICERT_CERT }} - DIGICERT_KEY: ${{ secrets.DIGICERT_KEY }} + WEBSOCKET_CERT: ${{ secrets.INSTA_WEBSOCKET_CERT }} + WEBSOCKET_KEY: ${{ secrets.INSTA_WEBSOCKET_KEY }} # https://stackoverflow.com/questions/59977364/github-actions-how-use-strategy-matrix-with-script # Required object fiels per environment: @@ -102,8 +101,8 @@ jobs: - name: Prepare certificates from secrets working-directory: wlan-cloud-ucentral-deploy/chart/environment-values run: | - echo "${{ env.DIGICERT_CERT }}" | base64 -d > cert.pem - echo "${{ env.DIGICERT_KEY }}" | base64 -d > key.pem + echo "${{ env.WEBSOCKET_CERT }}" | base64 -d > cert.pem + echo "${{ env.WEBSOCKET_KEY }}" | base64 -d > key.pem - name: Fetch kubeconfig run: | @@ -129,7 +128,7 @@ jobs: export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }} export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }} export IPTOCOUNTRY_IPINFO_TOKEN=${{ secrets.IPTOCOUNTRY_IPINFO_TOKEN }} - export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml + export VALUES_FILE_LOCATION=values.openwifi-qa-insta.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml if [[ "${{ github.event.inputs.force_latest }}" == "false" ]]; then export DEPLOY_METHOD=${{ matrix.deploy_method }} export CHART_VERSION=${{ matrix.chart_version }} diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index 4509f11b9..109636966 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -12,24 +12,23 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CLIENT_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CLIENT_KEY }} - # DigiCert certs - DIGICERT_CERT: ${{ secrets.DIGICERT_CERT }} - DIGICERT_KEY: ${{ secrets.DIGICERT_KEY }} + WEBSOCKET_CERT: ${{ secrets.INSTA_WEBSOCKET_CERT }} + WEBSOCKET_KEY: ${{ secrets.INSTA_WEBSOCKET_KEY }} -# # https://stackoverflow.com/questions/59977364/github-actions-how-use-strategy-matrix-with-script -# # Required object fiels per environment: -# # - namespace - namespace suffix that will used added for the Kubernetes environment (i.e. if you pass 'test', kubernetes namespace will be named 'openwifi-test') -# # - 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 -# # - 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) -# # - 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) -# # - 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 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) + # https://stackoverflow.com/questions/59977364/github-actions-how-use-strategy-matrix-with-script + # Required object fiels per environment: + # - namespace - namespace suffix that will used added for the Kubernetes environment (i.e. if you pass 'test', kubernetes namespace will be named 'openwifi-test') + # - 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 + # - 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) + # - 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) + # - 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 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", @@ -102,8 +101,8 @@ jobs: - name: Prepare certificates from secrets working-directory: wlan-cloud-ucentral-deploy/chart/environment-values run: | - echo "${{ env.DIGICERT_CERT }}" | base64 -d > cert.pem - echo "${{ env.DIGICERT_KEY }}" | base64 -d > key.pem + echo "${{ env.WEBSOCKET_CERT }}" | base64 -d > cert.pem + echo "${{ env.WEBSOCKET_KEY }}" | base64 -d > key.pem - name: Fetch kubeconfig run: | @@ -129,7 +128,7 @@ jobs: export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }} export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }} export IPTOCOUNTRY_IPINFO_TOKEN=${{ secrets.IPTOCOUNTRY_IPINFO_TOKEN }} - export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml + export VALUES_FILE_LOCATION=values.openwifi-qa-insta.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml if [[ "${{ github.event.inputs.force_latest }}" == "false" ]]; then export DEPLOY_METHOD=${{ matrix.deploy_method }} export CHART_VERSION=${{ matrix.chart_version }} diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index c12941315..9f5ad8b79 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -12,7 +12,6 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CLIENT_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CLIENT_KEY }} - # DigiCert certs WEBSOCKET_CERT: ${{ secrets.INSTA_WEBSOCKET_CERT }} WEBSOCKET_KEY: ${{ secrets.INSTA_WEBSOCKET_KEY }} diff --git a/.github/workflows/ucentralgw-qa2-deployment.yaml b/.github/workflows/ucentralgw-qa2-deployment.yaml index a2795310f..4b8b87b9c 100644 --- a/.github/workflows/ucentralgw-qa2-deployment.yaml +++ b/.github/workflows/ucentralgw-qa2-deployment.yaml @@ -12,7 +12,6 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CLIENT_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CLIENT_KEY }} - # DigiCert certs WEBSOCKET_CERT: ${{ secrets.INSTA_WEBSOCKET_CERT }} WEBSOCKET_KEY: ${{ secrets.INSTA_WEBSOCKET_KEY }}