Merge branch 'main' of github.com:linkerd/linkerd2 into matei/init-co…

…ntainer-resources
linkerd · Jun 21, 2024 · d8d5fe5 · d8d5fe5
2 parents 8997fcb + 010f15f
commit d8d5fe5
Show file tree

Hide file tree

Showing 41 changed files with 1,038 additions and 305 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      - uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78
+      - uses: tj-actions/changed-files@eaf854ef0c266753e1abec356dcf17d92695b251
         id: changed
         with:
           files: |

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       - id: tag
         run: echo "tag=$(CI_FORCE_CLEAN=1 bin/root-tag)" >> "$GITHUB_OUTPUT"
-      - uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78
+      - uses: tj-actions/changed-files@eaf854ef0c266753e1abec356dcf17d92695b251
         id: core
         with:
           files: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -199,7 +199,7 @@ jobs:
         #  mv choco/linkerd.*.nupkg "target/release/linkerd2-cli-stable-$v.nupkg" || true
       - name: Create release
         id: create_release
-        uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87
+        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
         with:
           name: "${{ needs.tag.outputs.tag }}"
           generate_release_notes: true

diff --git a/.proxy-version b/.proxy-version
@@ -1 +1 @@
-v2.236.0
+v2.237.0