Merge branch 'main' into johnoloughlin-patch-1

Author: johnoloughlin

.github/workflows/labeler.yml

@@ -21,4 +21,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9  # v5
+      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b  # v6.0.1

.github/workflows/post-merge-scorecard.yml

@@ -22,8 +22,8 @@ jobs:
       id-token: write
       contents: read
 
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge-scorecard.yml@93183bfab99c3bfd19f2a2f36adce36fc5bebe87  # v0.1.68
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge-scorecard.yml@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # 2026.0.17
     with:
       project_folder: "."
     secrets:
-      SYS_ORCH_GITHUB: ${{ secrets.SYS_ORCH_GITHUB }}
+      SYS_EMF_GH_TOKEN: ${{ secrets.SYS_EMF_GH_TOKEN }}

.github/workflows/post-merge.yml

@@ -18,17 +18,16 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@93183bfab99c3bfd19f2a2f36adce36fc5bebe87  # yamllint disable-line rule:line-length
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # yamllint disable-line rule:line-length
     with:
       run_version_check: true
       run_dep_version_check: false
       run_build: true
       run_docker_build: false
       run_docker_push: false
       run_version_tag: true
-      orch_ci_repo_ref: "main"
     secrets:
-      SYS_ORCH_GITHUB: ${{ secrets.SYS_ORCH_GITHUB }}
+      SYS_EMF_GH_TOKEN: ${{ secrets.SYS_EMF_GH_TOKEN }}
       NO_AUTH_ECR_PUSH_USERNAME: ${{ secrets.NO_AUTH_ECR_PUSH_USERNAME }}
       NO_AUTH_ECR_PUSH_PASSWD: ${{ secrets.NO_AUTH_ECR_PUSH_PASSWD }}
       MSTEAMS_WEBHOOK: ${{ secrets.TEAMS_WEBHOOK }}
@@ -38,12 +37,12 @@ jobs:
       contents: read
       pull-requests: read
       issues: write
-    uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@93183bfab99c3bfd19f2a2f36adce36fc5bebe87  # yamllint disable-line rule:line-length
+    uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # yamllint disable-line rule:line-length
     with:
       simple_mode: false
       branch_pattern: '^(main|release-[0-9]+\.[0-9]+.*)$'
       switch_main_to_dev: true
     secrets:
-      SYS_ORCH_GITHUB: ${{ secrets.SYS_ORCH_GITHUB }}
+      SYS_EMF_GH_TOKEN: ${{ secrets.SYS_EMF_GH_TOKEN }}
       DOC_AWS_ACCESS_KEY_ID: ${{ secrets.DOC_AWS_ACCESS_KEY_ID }}
       DOC_AWS_SECRET_ACCESS_KEY: ${{ secrets.DOC_AWS_SECRET_ACCESS_KEY }}

.github/workflows/pre-merge.yml

@@ -26,13 +26,13 @@ jobs:
         with:
           persist-credentials: false
       - name: "Verify Branch Name"
-        uses: open-edge-platform/orch-ci/verify-branch-name@93183bfab99c3bfd19f2a2f36adce36fc5bebe87  # yamllint disable-line rule:line-length
+        uses: open-edge-platform/orch-ci/verify-branch-name@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # yamllint disable-line rule:line-length
 
   pre-merge-pipeline:
     permissions:
       contents: read
     needs: pre-checks
-    uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@93183bfab99c3bfd19f2a2f36adce36fc5bebe87  # yamllint disable-line rule:line-length
+    uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # yamllint disable-line rule:line-length
     with:
       run_security_scans: false
       run_version_check: true
@@ -43,7 +43,6 @@ jobs:
       run_validate_clean_folder: false
       run_docker_build: false
       run_artifact: false
-      orch_ci_repo_ref: "main"
     secrets:
       NO_AUTH_ECR_PUSH_USERNAME: ${{ secrets.NO_AUTH_ECR_PUSH_USERNAME }}
       NO_AUTH_ECR_PUSH_PASSWD: ${{ secrets.NO_AUTH_ECR_PUSH_PASSWD }}

.github/workflows/publish-docs.yml

@@ -15,12 +15,12 @@ jobs:
       contents: read          # needed for actions/checkout
       pull-requests: read     # needed for gh pr list
       issues: write           # needed to post PR comment
-    uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@93183bfab99c3bfd19f2a2f36adce36fc5bebe87  # yamllint disable-line rule:line-length
+    uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # yamllint disable-line rule:line-length
     with:
       simple_mode: false
       branch_pattern: '^(main|release-[0-9]+\.[0-9]+.*)$'
       switch_main_to_dev: true
     secrets:
-      SYS_ORCH_GITHUB: ${{ secrets.SYS_ORCH_GITHUB }}
+      SYS_EMF_GH_TOKEN: ${{ secrets.SYS_EMF_GH_TOKEN }}
       DOC_AWS_ACCESS_KEY_ID: ${{ secrets.DOC_AWS_ACCESS_KEY_ID }}
       DOC_AWS_SECRET_ACCESS_KEY: ${{ secrets.DOC_AWS_SECRET_ACCESS_KEY }}

docs/deployment_guide/cloud_deployment/cloud_advanced/cloud_manual_modules.rst

@@ -21,7 +21,7 @@ Add configuration for modules
 +++++++++++++++++++++++++++++
 
 Each ``backend.tf`` file contains three values: ``region``, ``bucket``, and ``key``. These values are the same
-used during `Terraform configuration <adv_manual_terraconfig>`_.
+used during `Terraform configuration <./cloud_manual_terraconfig.html>`_.
 
 Every environment must use a unique region, bucket, and key combination. Terraform can't distinguish between environments.
 

docs/deployment_guide/cloud_deployment/cloud_get_started/cloud_orchestrator_install.rst

@@ -59,6 +59,13 @@ Create provisioning configuration
       the state of the cluster. It can be arbitrary, but must follow AWS bucket
       `naming rules <https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html>`_.
 
+   .. note::
+
+      The S3 bucket will be created in the same AWS region as the cluster. If you want to use
+      a different region for the S3 bucket, you need to manually export ``BUCKET_REGION=[bucket region]``
+      before running the command above. Replace ``[bucket region]`` with the name of the AWS region
+      where you want to create the S3 bucket.
+
    The following is an example:
 
    .. code-block:: shell

docs/deployment_guide/cloud_deployment/cloud_get_started/index.rst

@@ -53,13 +53,13 @@ Supported AWS regions
 Edge Orchestrator must be installed to an AWS Region with at least **three**
 `Availability Zones* <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-availability-zones>`_.
 
-You can use an `AWS Region map <https://www.cloudregions.io/aws/regions-map>`_ that lists Availability Zones per region to verify
+You can use an `AWS Region map <https://aws.amazon.com/about-aws/global-infrastructure/regions_az/>`_ that lists Availability Zones per region to verify
 that the AWS Region you plan to install to has a minimum of three Availability Zones.
 
 The Edge Orchestrator installer will verify that the selected AWS Region has at least three Availability Zones and error out if the requirement is not met.
 
 For Firewall configuration, see
-`Firewall Configuration </../../shared/shared_gs_iam>`__
+`Firewall Configuration <../../../shared/shared_gs_firewall_config.html>`__
 
 .. toctree::
    :hidden:

docs/deployment_guide/cloud_deployment/cloud_how_to/cloud_scale_orch.rst

@@ -169,7 +169,7 @@ Update Cluster Scale Settings
 .. note::
    Scaling Edge Orchestrator cluster may require changing of observability profile.
    For details on observability profiles, see
-   `Observability Configuration <../../cloud_deployment/cloud_get_started/system_requirements_aws_orch#edge-orchestrator-observability-configuration>`__.
+   `Observability Configuration <../../cloud_deployment/cloud_get_started/system_requirements_aws_orch.html#edge-orchestrator-observability-configuration>`__.
 
 .. note::
    When updating the cluster scale, you also need to provide flags from the installation step;

docs/deployment_guide/cloud_deployment/cloud_how_to/cloud_uninstall.rst

@@ -45,4 +45,4 @@ Uninstall Edge Orchestrator with no load balancer installed
 
 
 For a full list of flags available, see
-`flag examples <../cloud_examples/cloud_flags#flag-examples>`__.
+`flag examples <../cloud_examples/cloud_flags.html>`__.