Merge branch 'main' into dependabot/go_modules/app-resource-manager/go_modules-e1b2e84e8b

guptagunjan · web-flow · commit da307564ec99 · 2025-11-25T13:00:29.000+05:30
diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
@@ -14,7 +14,8 @@ on:
       - main
       - release-*
 
-permissions: {}
+permissions:
+  contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -29,11 +30,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
         with:
           persist-credentials: false
 
       - name: Update pull requests
-        uses: open-edge-platform/orch-ci/.github/actions/pr_updater@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+        uses: open-edge-platform/orch-ci/.github/actions/pr_updater@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
         with:
           github_token: ${{ secrets.SYS_ORCH_GITHUB }}
diff --git a/.github/workflows/common-comp-tests.yml b/.github/workflows/common-comp-tests.yml
@@ -40,7 +40,7 @@ jobs:
     steps:
       - name: Deploy Kind Orchestrator
         id: deploy-kind-orchestrator
-        uses: open-edge-platform/edge-manageability-framework/.github/actions/deploy_kind@4548dd7ad0c0bb86b9e86667904d37d070645a9b
+        uses: open-edge-platform/edge-manageability-framework/.github/actions/deploy_kind@908c52bbc37bc3a6d62cdf6e4a1060526d5a4464
         timeout-minutes: 45
         with:
           orch_version: ${{ inputs.emf-branch || 'main' }}
@@ -58,7 +58,7 @@ jobs:
           go-version: 1.24.9
 
       - name: Checkout app-orch-deployment repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
         with:
           repository: open-edge-platform/app-orch-deployment
           persist-credentials: false
diff --git a/.github/workflows/go-fuzz.yml b/.github/workflows/go-fuzz.yml
@@ -48,7 +48,7 @@ jobs:
   go-fuzz-adm:
     if: ${{ inputs.run_adm || github.event_name == 'schedule' }}
     name: ADM Go Fuzzing Tests
-    uses: open-edge-platform/orch-ci/.github/workflows/apporch-go-fuzz.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/apporch-go-fuzz.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       # Declare 1200 secs duration since schedule event will not pick up input values from workflow_dispatch
       fuzz_seconds: ${{ fromJSON(inputs.fuzz_seconds_adm || 1200) }}
@@ -57,7 +57,7 @@ jobs:
   go-fuzz-arm:
     if: ${{ inputs.run_arm || github.event_name == 'schedule' }}
     name: ARM Go Fuzzing Tests
-    uses: open-edge-platform/orch-ci/.github/workflows/apporch-go-fuzz.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/apporch-go-fuzz.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       # Declare 2100 secs duration since schedule event will not pick up input values from workflow_dispatch
       fuzz_seconds: ${{ fromJSON(inputs.fuzz_seconds_arm || 2100) }}
@@ -66,7 +66,7 @@ jobs:
   go-fuzz-asp:
     if: ${{ inputs.run_asp || github.event_name == 'schedule'}}
     name: ASP Go Fuzzing Tests
-    uses: open-edge-platform/orch-ci/.github/workflows/apporch-go-fuzz.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/apporch-go-fuzz.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       # Declare 4800 secs duration since schedule event will not pick up input values from workflow_dispatch
       fuzz_seconds: ${{ fromJSON(inputs.fuzz_seconds_asp || 4800) }}
diff --git a/.github/workflows/post-merge-adm-nbi.yaml b/.github/workflows/post-merge-adm-nbi.yaml
@@ -13,15 +13,16 @@ on:
       - 'app-deployment-manager/api/nbi/**'
   workflow_dispatch:
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
   post-merge-pipeline:
     permissions:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       run_version_check: false
       run_dep_version_check: false
diff --git a/.github/workflows/post-merge-adm.yaml b/.github/workflows/post-merge-adm.yaml
@@ -13,15 +13,16 @@ on:
       - 'app-deployment-manager/**'
   workflow_dispatch:
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
   post-merge-pipeline:
     permissions:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       run_version_check: true
       run_dep_version_check: false
diff --git a/.github/workflows/post-merge-arm.yaml b/.github/workflows/post-merge-arm.yaml
@@ -13,15 +13,16 @@ on:
       - 'app-resource-manager/**'
   workflow_dispatch:
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
   post-merge-pipeline:
     permissions:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       run_version_check: true
       run_dep_version_check: false
diff --git a/.github/workflows/post-merge-asp.yaml b/.github/workflows/post-merge-asp.yaml
@@ -13,15 +13,16 @@ on:
       - 'app-service-proxy/**'
   workflow_dispatch:
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
   post-merge-pipeline:
     permissions:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       run_version_check: true
       run_dep_version_check: false
diff --git a/.github/workflows/post-merge-interconnect.yaml b/.github/workflows/post-merge-interconnect.yaml
@@ -13,15 +13,16 @@ on:
       - 'app-interconnect/**'
   workflow_dispatch:
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
   post-merge-pipeline:
     permissions:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       run_version_check: true
       run_dep_version_check: false
diff --git a/.github/workflows/post-merge-scorecard.yml b/.github/workflows/post-merge-scorecard.yml
@@ -16,10 +16,11 @@ permissions:
 jobs:
   call-scorecard:
     permissions:
-      contents: read
-      security-events: write
+      security-events: write   # required for SARIF upload
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge-scorecard.yml@main
+      contents: read
+
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge-scorecard.yml@79c4381f9be567527d8782094317b0282493e45a  # v0.1.66
     with:
       project_folder: "."
     secrets:
diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml
@@ -20,14 +20,14 @@ jobs:
     outputs:
       filtered_projects: ${{ steps.filter-changes.outputs.filtered_projects }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
         with:
           persist-credentials: false
       - name: "Verify Branch Name"
-        uses: open-edge-platform/orch-ci/verify-branch-name@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+        uses: open-edge-platform/orch-ci/verify-branch-name@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
       - name: "Discover Changed Subfolders"
         id: discover-changes
-        uses: open-edge-platform/orch-ci/discover-changed-subfolders@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+        uses: open-edge-platform/orch-ci/discover-changed-subfolders@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
       - name: "Filter Out Unwanted Changed Subfolders"
         id: filter-changes
         env:
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         project_folder: ${{ fromJson(needs.pre-checks.outputs.filtered_projects) }}
-    uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@57ae89489027070792089531710c450af3b66c26  # 0.1.64
+    uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@79c4381f9be567527d8782094317b0282493e45a  # 0.1.66
     with:
       run_version_check: true
       run_dep_version_check: false
diff --git a/app-deployment-manager/VERSION b/app-deployment-manager/VERSION
@@ -1 +1 @@
-2.5.7
+2.5.8-dev
diff --git a/app-deployment-manager/deployment/charts/app-deployment-crd/Chart.yaml b/app-deployment-manager/deployment/charts/app-deployment-crd/Chart.yaml
@@ -6,8 +6,8 @@ apiVersion: v2
 description: App Deployment CustomResourceDefinitions
 name: app-deployment-crd
 # Correct version will be added by "make helm-package" from VERSION
-version: 2.5.7
+version: 2.5.8-dev
 annotations:
-  revision: "88aedf0"
-  created: "2025-11-14T06:06:19Z"
-appVersion: 2.5.7
+  revision: "a137f0d"
+  created: "2025-11-25T06:24:27Z"
+appVersion: 2.5.8-dev-a137f0d
diff --git a/app-deployment-manager/deployment/charts/app-deployment-manager/Chart.yaml b/app-deployment-manager/deployment/charts/app-deployment-manager/Chart.yaml
@@ -6,8 +6,8 @@ apiVersion: v2
 description: App Deployment Manager
 name: app-deployment-manager
 # Correct version will be added by "make helm-package" from VERSION
-version: 2.5.7
+version: 2.5.8-dev
 annotations:
-  revision: "88aedf0"
-  created: "2025-11-14T06:06:19Z"
-appVersion: 2.5.7
+  revision: "a137f0d"
+  created: "2025-11-25T06:24:27Z"
+appVersion: 2.5.8-dev-a137f0d
diff --git a/app-resource-manager/VERSION b/app-resource-manager/VERSION
@@ -1 +1 @@
-2.5.2
+2.5.3-dev
diff --git a/app-resource-manager/deployments/app-resource-manager/Chart.yaml b/app-resource-manager/deployments/app-resource-manager/Chart.yaml
@@ -16,11 +16,11 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 2.5.2
+version: 2.5.3-dev
 # Default appVersion will be overwritten by the build to use {repo}/VERSION. This
 # value is supplied only to enable local unbuilt deployment of default released
 # content.
-appVersion: 2.5.2
+appVersion: 2.5.3-dev-a137f0d
 annotations:
-  revision: "88aedf0"
-  created: "2025-11-14T06:08:29Z"
+  revision: "a137f0d"
+  created: "2025-11-25T06:28:09Z"
diff --git a/app-service-proxy/VERSION b/app-service-proxy/VERSION
@@ -1 +1 @@
-1.5.3
+1.5.4-dev
diff --git a/app-service-proxy/deployments/app-service-proxy/Chart.yaml b/app-service-proxy/deployments/app-service-proxy/Chart.yaml
@@ -4,9 +4,9 @@
 ---
 apiVersion: v2
 name: app-service-proxy
-version: "1.5.3"
+version: "1.5.4-dev"
 description: Application Service Proxy
 annotations:
-  revision: "88aedf0"
-  created: "2025-11-14T06:11:30Z"
-appVersion: 1.5.3
+  revision: "a137f0d"
+  created: "2025-11-25T06:27:44Z"
+appVersion: 1.5.4-dev-a137f0d
