Revert "chore(ci)!: update CLI build pipeline (#14360)"

This reverts commit e514bc1.

Signed-off-by: katelyn martin <[email protected]>

Author: cratelyn

.github/actions/cli-setup/action.yaml

@@ -65,10 +65,28 @@ jobs:
   build-cli:
     needs: meta
     if: needs.meta.outputs.changed == 'true'
-    uses: ./.github/workflows/cli-build.yml
-    with:
-      version: ${{ needs.meta.outputs.tag }}
-      target: linux-amd64
+    runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: ./.github/actions/docker-build
+        id: build
+        with:
+          docker-registry: ${{ env.DOCKER_REGISTRY }}
+          docker-target: linux-amd64
+          component: cli-bin
+          tag: ${{ needs.meta.outputs.tag }}
+      - name: Extract CLI binary
+        run: |
+          mkdir -p /home/runner/archives
+          id=$(docker create '${{ steps.build.outputs.image }}')
+          docker cp "$id:/out/linkerd-linux-amd64" /home/runner/archives/linkerd
+          v=$(/home/runner/archives/linkerd version --short --client)
+          [[ "$v" == '${{ needs.meta.outputs.tag }}' ]] || exit 1
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+        with:
+          name: image-archives-cli
+          path: /home/runner/archives
 
   ##
   ## Core: Test the core control plane
@@ -128,12 +146,9 @@ jobs:
           pattern: image-archives-*
           path: image-archives
           merge-multiple: true
+      - run: cp image-archives/linkerd "$HOME" && chmod 755 "$HOME/linkerd"
       - run: find image-archives -ls
-      - uses: ./.github/actions/cli-setup
-        with:
-          artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-          target: ${{ runner.temp }}/linkerd
-      - run: bin/tests --images archive --cleanup-docker --name ${{ matrix.test }} ${{ runner.temp }}/linkerd
+      - run: bin/tests --images archive --cleanup-docker --name ${{ matrix.test }} "$HOME/linkerd"
         env:
           LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
           TAG: ${{ needs.meta.outputs.tag }}
@@ -181,10 +196,7 @@ jobs:
           path: image-archives
           merge-multiple: true
       - run: find image-archives -ls
-      - uses: ./.github/actions/cli-setup
-        with:
-          artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-          target: ${{ runner.temp }}/linkerd
+      - run: cp image-archives/linkerd "$HOME" && chmod 755 "$HOME/linkerd"
       - name: Setup deps
         shell: bash
         run: |
@@ -205,7 +217,7 @@ jobs:
       - run: docker load <image-archives/controller.tar
       - run: docker load <image-archives/proxy.tar
       - run: docker image ls
-      - run: just linkerd-tag='${{ needs.meta.outputs.tag }}' linkerd-exec="${{ runner.temp }}/linkerd" linkerd-install
+      - run: just linkerd-tag='${{ needs.meta.outputs.tag }}' linkerd-exec="$HOME/linkerd" linkerd-install
       - name: Load images
         run: |
           # Image loading is flakey in CI, so retry!
@@ -283,12 +295,9 @@ jobs:
           pattern: image-archives-*
           path: image-archives
           merge-multiple: true
-      - run: find image-archives -ls
-      - uses: ./.github/actions/cli-setup
-        with:
-          artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-          target: ${{ runner.temp }}/linkerd
-      - run: bin/tests --images archive --cleanup-docker --name '${{ matrix.integration_test }}' ${{ runner.temp }}/linkerd
+      - run: cp image-archives/linkerd "$HOME" && chmod 755 "$HOME/linkerd"
+      - run: ls -l image-archives/linkerd
+      - run: bin/tests --images archive --cleanup-docker --name '${{ matrix.integration_test }}' "$HOME/linkerd"
         env:
           LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
 
@@ -311,11 +320,9 @@ jobs:
           pattern: image-archives-*
           path: image-archives
           merge-multiple: true
-      - uses: ./.github/actions/cli-setup
-        with:
-          artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-          target: ${{ runner.temp }}/linkerd
-      - run: bin/tests --images archive --cleanup-docker --name viz ${{ runner.temp }}/linkerd
+      - run: cp image-archives/linkerd "$HOME" && chmod 755 "$HOME/linkerd"
+      - run: ls -l image-archives/linkerd
+      - run: bin/tests --images archive --cleanup-docker --name viz "$HOME/linkerd"
         env:
           LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
 
@@ -350,11 +357,8 @@ jobs:
           pattern: image-archives-*
           path: image-archives
           merge-multiple: true
-      - run: find image-archives -ls
-      - uses: ./.github/actions/cli-setup
-        with:
-          artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-          target: ${{ runner.temp }}/linkerd
+      - run: cp image-archives/linkerd "$HOME" && chmod 755 "$HOME/linkerd"
+      - run: ls -l image-archives/linkerd
       - name: Setup deps
         shell: bash
         run: |

.github/workflows/cli-build.yml

@@ -40,6 +40,7 @@ jobs:
     strategy:
       matrix:
         component:
+          - cli-bin
           - controller
           - debug
           - jaeger-webhook
@@ -71,12 +72,26 @@ jobs:
       - run: cosign sign '${{ steps.build.outputs.digest }}'
         env:
           COSIGN_YES: true
-
-  cli:
-    needs: tag
-    uses: ./.github/workflows/cli-build.yml
-    with:
-      version: ${{ needs.tag.outputs.tag }}
+      - name: Create artifact with CLI
+        # windows_static_cli_tests below needs this because it can't create linux containers
+        # inside windows
+        if: matrix.component == 'cli-bin'
+        env:
+          ARCHIVES: /home/runner/archives
+          DOCKER_TARGET: windows
+        run: |
+          bin/docker-pull-binaries "$TAG"
+          mkdir -p "$ARCHIVES"
+          cp -r "$PWD/target/release/linkerd2-cli-$TAG-windows.exe" "$ARCHIVES/linkerd-windows.exe"
+      # `with.path` values do not support environment variables yet, so an
+      # absolute path is used here.
+      # https://github.com/actions/upload-artifact/issues/8
+      - name: Upload artifact
+        if: matrix.component == 'cli-bin'
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+        with:
+          name: image-archives-cli
+          path: /home/runner/archives
 
   windows_static_cli_tests:
     name: Static CLI tests (windows)
@@ -99,7 +114,7 @@ jobs:
 
   integration_tests:
     name: Integration tests
-    needs: [tag, cli, docker_build]
+    needs: [tag, docker_build]
     strategy:
       matrix:
         integration_test:
@@ -121,34 +136,42 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
         with:
           go-version: "1.24"
-      - uses: ./.github/actions/cli-setup
-        with:
-          artifact-id: ${{ needs.cli.outputs.artifact-id }}
-          target: ${{ runner.temp }}/linkerd
-      - run: echo TAG="${{ needs.tag.outputs.tag }}" >> "$GITHUB_ENV"
-      - name: Validate the CLI version matches the current build tag.
+      - name: Set environment variables from scripts
         run: |
-          [[ "$TAG" == "$(${{ runner.temp }}/linkerd version --short --client)" ]]
-      - run: bin/tests --images preload --name ${{ matrix.integration_test }} "${{ runner.temp }}/linkerd"
+          TAG='${{ needs.tag.outputs.tag }}'
+          CMD="$PWD/target/release/linkerd2-cli-$TAG-linux-amd64"
+          echo "CMD=$CMD" >> "$GITHUB_ENV"
+          echo "TAG=$TAG" >> "$GITHUB_ENV"
+      - name: Run integration tests
         env:
           LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
+        run: |
+          bin/docker-pull-binaries "$TAG"
+          # Validate the CLI version matches the current build tag.
+          [[ "$TAG" == "$($CMD version --short --client)" ]]
+          bin/tests --images preload --name ${{ matrix.integration_test }} "$CMD"
 
   gh_release:
     name: Create GH release
     needs:
       - tag
-      - cli
       - integration_tests
     timeout-minutes: 30
     runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
-        with:
-          artifact-ids: ${{ needs.cli.outputs.artifact-id }}
-          path: cli
+      # - name: Download choco package
+      #   if: startsWith(github.ref, 'refs/tags/stable')
+      #   uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+      #   with:
+      #     name: choco
+      #     path: choco
+      - name: Pull CLI binaries
+        run: DOCKER_TARGET=multi-arch bin/docker-pull-binaries '${{ needs.tag.outputs.tag }}'
+        #  v=${TAG#"stable-"}
+        #  mv choco/linkerd.*.nupkg "target/release/linkerd2-cli-stable-$v.nupkg" || true
       - name: Create release
         id: create_release
         uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
@@ -158,7 +181,10 @@ jobs:
           draft: false
           prerelease: false
           files: |
-            ./cli/linkerd2-cli-*
+            ./target/release/linkerd2-cli-*-darwin*
+            ./target/release/linkerd2-cli-*-linux-*
+            ./target/release/linkerd2-cli-*-windows.*
+            ./target/release/linkerd2-cli-*.nupkg
 
   website_publish:
     name: Linkerd website publish

.github/workflows/integration.yml

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set -eu
+
+if [ $# -eq 1 ]; then
+    tag=${1:-}
+else
+    echo "usage: ${0##*/} tag" >&2
+    exit 64
+fi
+
+bindir=$( cd "${BASH_SOURCE[0]%/*}" && pwd )
+rootdir=$( cd "$bindir"/.. && pwd )
+
+# shellcheck source=_docker.sh
+. "$bindir"/_docker.sh
+
+workdir=$rootdir/target/release
+mkdir -p "$workdir"
+
+# create shorttag where eventual initial v in tag is stripped
+shorttag=${tag#v}
+
+# create the cli-bin container in order to extract the binaries
+id=$(docker create "$(docker_repo cli-bin):$tag")
+
+OS=$DOCKER_TARGET
+if [ "$DOCKER_TARGET" = 'multi-arch' ]; then
+  OS=$OS_ARCH_ALL
+fi
+
+for os in $OS; do
+  ext=$os
+  if [ "$os" = windows ]; then
+    ext=windows.exe
+  fi
+  filepath=$workdir/linkerd2-cli-$shorttag-$ext
+  docker cp "$id:/out/linkerd-$os" "$filepath"
+  openssl dgst -sha256 "$filepath" | awk '{print $2}' > "$filepath.sha256"
+  echo "$filepath"
+done
+
+# cleanup the cli-bin container when finished
+docker rm "$id" > /dev/null