Merge branch 'main' into feat-add-ngf

Author: ADubhlaoich

.github/workflows/build-push.yml

@@ -123,7 +123,7 @@ jobs:
     needs: call-docs-build-push
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.workflow_run.head_branch }}
       - uses: actions/setup-node@v4

.github/workflows/dot-org-content.yml

@@ -16,7 +16,7 @@ jobs:
       IS_CHANGES_DETECTED: ${{ steps.check_changes.outputs.changed }}
     steps: 
       - name: Checkout Repository
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
         with:
           fetch-depth: 0
       - name: Clone the nginx/nginx-org repository

.github/workflows/fossa.yml

@@ -22,7 +22,7 @@ jobs:
     if: ${{ github.event.repository.fork == false }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
 
       - name: Scan
         uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0

.github/workflows/mend.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
         with:
           ref: ${{ inputs.branch && inputs.branch || github.ref }}
 

.github/workflows/ossf_scorecard.yml

@@ -29,7 +29,7 @@ jobs:
       checks: read # To detect SAST tools
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.0
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.0
         with:
           persist-credentials: false
 
@@ -56,6 +56,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload SARIF results to code scanning
-        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
+        uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/playwright.yml

@@ -8,7 +8,7 @@ jobs:
   run-playwright-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*

static/ngf/img/src/advanced-routing.mermaid

@@ -3,33 +3,30 @@ graph LR
     users[Users]
     ngfSvc["Public Endpoint\nfor\ncafe.example.com"]
     subgraph cluster [Kubernetes Cluster]
-        subgraph clusterPadding [" "]
-            subgraph clusterPadding2 [" "]
-                subgraph gwNS [Namespace\nnginx-gateway]
-                    ngfPod[Pod\nnginx-gateway]
-                end
-            end
-        end
         subgraph appNs [Namespace\ndefault]
             subgraph nsPadding [" "]
+                nginxPod[Pod\nNGINX]
                 coffeeV1Pod[Pod\ncoffee v1]
                 coffeeV2Pod[Pod\ncoffee v2]
                 teaPod[Pod\ntea]
                 teaPostPod[Pod\ntea-post]
             end
         end
     end
-  ngfSvc --> ngfPod
-  ngfPod --/coffee--> coffeeV1Pod
-  ngfPod --/coffee\nheader: version=v2\nOR\n/coffee?TEST=v2--> coffeeV2Pod
-  ngfPod --GET /tea--> teaPod
-  ngfPod --POST /tea--> teaPostPod
+
+  ngfSvc --> nginxPod
+  nginxPod --/coffee--> coffeeV1Pod
+  nginxPod --/coffee\nheader: version=v2\nOR\n/coffee?TEST=v2--> coffeeV2Pod
+  nginxPod --GET /tea--> teaPod
+  nginxPod --POST /tea--> teaPostPod
   users --> ngfSvc
+
   class clusterPadding,nsPadding,clusterPadding2 noBorder
   class gwNS,appNs namespace
-  class ngfSvc,ngfPod nginxNode
+  class ngfSvc,nginxPod nginxNode
   class coffeeV1Pod,coffeeV2Pod coffeeNode
   class teaPod,teaPostPod teaNode
+
   classDef noBorder stroke:none,fill:none
   classDef default fill:#FFFFFF,stroke:#000000
   classDef namespace fill:#FFFFFF,stroke:#036ffc,stroke-dasharray: 5 5,text-align:center

static/ngf/img/src/route-all-traffic-flow.mermaid

@@ -5,35 +5,26 @@ graph LR
 
     subgraph cluster [Kubernetes Cluster]
         style cluster fill:#FFFFFF,stroke:#000000
-        subgraph clusterPadding [" "]
-            subgraph clusterPadding2 [" "]
-                subgraph gwNS [Namespace\nnginx-gateway]
-                    ngfPod[Pod\nnginx-gateway]
-                end
-            end
-        end
 
         subgraph appNs [Namespace\ndefault]
             subgraph nsPadding [" "]
+            nginxPod[Pod\nNGINX]
                 coffeePod1[Pod\ncoffee]
                 coffeePod2[Pod\ncoffee]
             end
         end
     end
 
-
-
-  ngfSvc --> ngfPod
-  ngfPod --> coffeePod1 & coffeePod2
+  ngfSvc --> nginxPod
+  nginxPod --> coffeePod1 & coffeePod2
   clients --> ngfSvc
 
   class clusterPadding,nsPadding,clusterPadding2 noBorder
   class gwNS,appNs namespace
-  class ngfPod,ngfSvc nginxNode
+  class nginxPod,ngfSvc nginxNode
   class coffeePod1,coffeePod2 coffeeNode
   class clients clientNode
 
-
   classDef noBorder stroke:none,fill:none
   classDef default fill:#FFFFFF,stroke:#000000
   classDef namespace fill:#FFFFFF,stroke:#036ffc,stroke-dasharray: 5 5,text-align:center