From c9bc2579a951f6e1ee38d35ab776bea9d7d67dc7 Mon Sep 17 00:00:00 2001
From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Date: Wed, 18 Jun 2025 14:54:25 +0000
Subject: [PATCH 1/3] linkerd2/25.6.3 package update

Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
---
 linkerd2.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linkerd2.yaml b/linkerd2.yaml
index 8b8c4a289fc..70980292761 100644
--- a/linkerd2.yaml
+++ b/linkerd2.yaml
@@ -1,6 +1,6 @@
 package:
   name: linkerd2
-  version: "25.6.2"
+  version: "25.6.3"
   epoch: 0
   description: "meta linkerd package"
   copyright:
@@ -31,7 +31,7 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: b85a766cde784a137e40e6d3839f304df1a3eb13
+      expected-commit: f9150a804cfc64a12f5e5f0864675fdc5fa9631a
       repository: https://github.com/linkerd/linkerd2/
       tag: edge-${{package.version}}
 

From 578389a58ec8cc52cc8bfc00a275530bf0b74d11 Mon Sep 17 00:00:00 2001
From: Ajay Kemparaj <ajaykemparaj@gmail.com>
Date: Thu, 19 Jun 2025 15:33:17 -0700
Subject: [PATCH 2/3] Update linkerd2.yaml

Signed-off-by: Ajay Kemparaj <ajaykemparaj@gmail.com>
---
 linkerd2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linkerd2.yaml b/linkerd2.yaml
index 70980292761..bb207c460be 100644
--- a/linkerd2.yaml
+++ b/linkerd2.yaml
@@ -31,7 +31,7 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: f9150a804cfc64a12f5e5f0864675fdc5fa9631a
+      expected-commit: 192125773e5658ff4d314a897af93b0ff693d725
       repository: https://github.com/linkerd/linkerd2/
       tag: edge-${{package.version}}
 

From 9e2029b7fd47c086421cf10fcb67ecb2cdf114ca Mon Sep 17 00:00:00 2001
From: Debasish Biswas <debasishbsws.dev@gmail.com>
Date: Fri, 20 Jun 2025 20:55:31 +0530
Subject: [PATCH 3/3] Redirect the test out put to a log file and check for the
 string there

Signed-off-by: Debasish Biswas <debasishbsws.dev@gmail.com>
---
 linkerd2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linkerd2.yaml b/linkerd2.yaml
index bb207c460be..2bc0feee6a9 100644
--- a/linkerd2.yaml
+++ b/linkerd2.yaml
@@ -55,7 +55,7 @@ subpackages:
           runs: |
             /web -version
             /web -help
-            /web 2>&1 | grep 'starting admin server'
+            /web > web.log 2>&1 && cat web.log | grep 'starting admin server'
     dependencies:
       runtime:
         - merged-bin