From fb1d46e965d4dafec857c2c4efb3151796f95583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= <batuhan.apaydin@chainguard.dev>
Date: Mon, 18 Nov 2024 19:34:09 +0300
Subject: [PATCH] add istioctl cli to istio package (#34452)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!---
Provide a short summary in the Title above. Examples of good PR titles:
* "ruby-3.1: new package"
* "haproxy: fix CVE-2014-123456"
-->

<!--
Please include references to any related issues or delete this section
otherwise.
 -->

Fixes:

Related: adds istioctl sub-package to the istio package

### Pre-review Checklist

<!--
This checklist is mostly useful as a reminder of small things that can
easily be
forgotten – it is meant as a helpful tool rather than hoops to jump
through.

At the moment of this PR you have the most information on what all the
change
will affect, so please take the time to jot it down.

Put an `x` in all the items that apply, make notes next to any that
haven't been
addressed, and remove any items that are not relevant to this PR.

-->

#### For new package PRs only
<!-- remove if unrelated -->
- [ ] This PR is marked as fixing a pre-existing package request bug
- [ ] Alternatively, the PR is marked as related to a pre-existing
package request bug, such as a dependency
- [x] REQUIRED - The package is available under an OSI-approved or
FSF-approved license
- [x] REQUIRED - The version of the package is still receiving security
updates
- [ ] This PR links to the upstream project's support policy (e.g.
`endoflife.date`)

Signed-off-by: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
---
 istio-1.24.yaml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/istio-1.24.yaml b/istio-1.24.yaml
index 2d8d9cd838d..37e0b3e8b0e 100644
--- a/istio-1.24.yaml
+++ b/istio-1.24.yaml
@@ -1,7 +1,7 @@
 package:
   name: istio-1.24
   version: 1.24.0
-  epoch: 1
+  epoch: 2
   description: Istio is an open source service mesh that layers transparently onto existing distributed applications.
   copyright:
     - license: Apache-2.0
@@ -40,6 +40,26 @@ subpackages:
       provides:
         - istio-cni=${{package.full-version}}
 
+  - name: istioctl-${{vars.major-minor-version}}
+    pipeline:
+      - uses: go/build
+        with:
+          packages: ./istioctl/cmd/istioctl
+          output: istioctl
+          ldflags: |
+            -X istio.io/istio/pkg/version.buildVersion=${{package.version}}
+            -X istio.io/istio/pkg/version.buildGitRevision=$(git rev-parse HEAD)
+            -X istio.io/istio/pkg/version.buildTag=$(git describe --tags --always)
+            -X istio.io/istio/pkg/version.buildStatus="Clean"
+    dependencies:
+      provides:
+        - istioctl=${{package.full-version}}
+    test:
+      pipeline:
+        - runs: |
+            istioctl version
+            istioctl --help
+
   - name: istio-cni-${{vars.major-minor-version}}-compat
     pipeline:
       - runs: |