From a99a7aa2f477cb8a084686286d762fabbfed9c22 Mon Sep 17 00:00:00 2001 From: Heng Gai Deng Date: Mon, 21 Jul 2025 17:06:33 -0700 Subject: [PATCH] Point to longevity basic nginxaas deployment --- .github/workflows/azure-pipeline-build.yml | 11 ++++++----- .../github-action-test-nginxaas-deploy.yml | 19 +++++++++---------- azure-pipeline/src/task.json | 2 +- azure-pipeline/vss-extension.json | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/azure-pipeline-build.yml b/.github/workflows/azure-pipeline-build.yml index 0d7719a..883e369 100644 --- a/.github/workflows/azure-pipeline-build.yml +++ b/.github/workflows/azure-pipeline-build.yml @@ -9,12 +9,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: '14' + node-version: '20' - name: Install dependencies and build run: | @@ -27,10 +27,11 @@ jobs: - name: Create extension run: | - tfx extension create --manifest-globs ./azure-pipeline/vss-extension.json + cd azure-pipeline + tfx extension create --manifest-globs ./vss-extension.json - name: Upload VSIX file - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: VSIX file path: ./azure-pipeline/*.vsix diff --git a/.github/workflows/github-action-test-nginxaas-deploy.yml b/.github/workflows/github-action-test-nginxaas-deploy.yml index f78af24..12802b1 100644 --- a/.github/workflows/github-action-test-nginxaas-deploy.yml +++ b/.github/workflows/github-action-test-nginxaas-deploy.yml @@ -6,11 +6,11 @@ on: - cron: "0 20 * * *" env: - NGINX_DEPLOYMENT_NAME: github-action-test-dep + NGINX_DEPLOYMENT_NAME: n4a-long-eastus2-basic-ngx NGINX_TRANSFORMED_CONFIG_DIR_PATH: /etc/nginx/ NGINX_ROOT_CONFIG_FILE: nginx.conf - TEST_RESOURCE_GROUP_NAME: github-action-test - NGINX_CERT_NAME: github-action-test-crt + TEST_RESOURCE_GROUP_NAME: n4a-long-eastus2-workload + NGINX_CERT_NAME: n4a-long-eastus2-basic-crt NGINX_VAULT_NAME: nlbtest-customer permissions: @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Checkout repository" - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: "AZ CLI Login" uses: azure/login@v2 with: @@ -47,7 +47,7 @@ jobs: - name: "Validate config update - single file" shell: bash run: | - curl -s -o /dev/null -D - http://${{ secrets.NGINX_DEPLOYMENT_IP }} | grep "Github-Run-Id: $GITHUB_RUN_ID" + curl -s -o /dev/null -D - http://${{ secrets.NGINX_DEPLOYMENT_FQDN }} | grep "Github-Run-Id: $GITHUB_RUN_ID" - name: "Update config - multi file" shell: bash run: | @@ -61,16 +61,15 @@ jobs: subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} resource-group-name: $TEST_RESOURCE_GROUP_NAME nginx-deployment-name: $NGINX_DEPLOYMENT_NAME - nginx-deployment-location: "westcentralus" + nginx-deployment-location: "eastus2" nginx-config-directory-path: github-action/test/configs/multi/ nginx-root-config-file: $NGINX_ROOT_CONFIG_FILE transformed-nginx-config-directory-path: $NGINX_TRANSFORMED_CONFIG_DIR_PATH - nginx-certificates: '[{"certificateName": "$NGINX_CERT_NAME", "keyvaultSecret": "https://$NGINX_VAULT_NAME.vault.azure.net/secrets/$NGINX_CERT_NAME", "certificateVirtualPath": "/etc/nginx/ssl/$GITHUB_RUN_ID/my-cert.crt", "keyVirtualPath": "/etc/nginx/ssl/$GITHUB_RUN_ID/my-cert.key" } ]' - + nginx-certificates: '[{"certificateName": "github-action-test-crt", "keyvaultSecret": "https://$NGINX_VAULT_NAME.vault.azure.net/secrets/$NGINX_CERT_NAME", "certificateVirtualPath": "/etc/nginx/ssl/$GITHUB_RUN_ID/my-cert.crt", "keyVirtualPath": "/etc/nginx/ssl/$GITHUB_RUN_ID/my-cert.key" } ]' - name: "Validate config update" shell: bash run: | - curl -s -o /dev/null -D - http://${{ secrets.NGINX_DEPLOYMENT_IP }} | grep "Github-Run-Id: $GITHUB_RUN_ID" + curl -s -o /dev/null -D - http://${{ secrets.NGINX_DEPLOYMENT_FQDN }} | grep "Github-Run-Id: $GITHUB_RUN_ID" - name: "Validate certificate update" uses: azure/cli@v2 with: @@ -78,4 +77,4 @@ jobs: echo "-----BEGIN CERTIFICATE-----" > /tmp/$GITHUB_RUN_ID.tmp az keyvault certificate show --vault-name $NGINX_VAULT_NAME -n $NGINX_CERT_NAME | jq -r .cer | cat >> /tmp/$GITHUB_RUN_ID.tmp echo "-----END CERTIFICATE-----" >> /tmp/$GITHUB_RUN_ID.tmp - curl -s -o /dev/null -D - https://${{ secrets.NGINX_DEPLOYMENT_IP }} --cacert /tmp/$GITHUB_RUN_ID.tmp | grep "Github-Run-Id: $GITHUB_RUN_ID" + curl -s -o /dev/null -D - https://${{ secrets.NGINX_DEPLOYMENT_FQDN }} --cacert /tmp/$GITHUB_RUN_ID.tmp | grep "Github-Run-Id: $GITHUB_RUN_ID" diff --git a/azure-pipeline/src/task.json b/azure-pipeline/src/task.json index dde5a62..35fa494 100644 --- a/azure-pipeline/src/task.json +++ b/azure-pipeline/src/task.json @@ -74,7 +74,7 @@ } ], "execution": { - "Node10": { + "Node20_1": { "target": "dist/index.js" } } diff --git a/azure-pipeline/vss-extension.json b/azure-pipeline/vss-extension.json index 219c131..40a619d 100644 --- a/azure-pipeline/vss-extension.json +++ b/azure-pipeline/vss-extension.json @@ -9,7 +9,7 @@ "id": "Microsoft.VisualStudio.Services" } ], - "description": "This extension provides a streamlined solution for synchronizing NGINX configuration files with Azure deployments. Designed to support Azure DevOps pipelines, it automates the process of packaging and uploading NGINX configurations to Azure, enhancing efficiency, version control, and security. Ideal for continuous integration and deployment workflows, it simplifies the management of NGINXaaS configurations within the Azure ecosystem.", + "description": "This extension provides a streamlined solution for synchronizing NGINX configuration files with Azure deployments.", "categories": [ "Azure Pipelines" ],