-
Notifications
You must be signed in to change notification settings - Fork 336
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…1857) Automatic cherry-pick of #11851 for branch release-2.5 Generated by [action](https://github.com/kumahq/kuma/actions/runs/11511857576) cherry-picked commit 529694b⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking!⚠️ ⚠️ ⚠️ ``` On branch release-2.5 Your branch is up to date with 'origin/release-2.5'. You are currently cherry-picking commit 529694b. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: deleted: test/k3d/calico.yaml.kubelint-excluded Unmerged paths: (use "git add <file>..." to mark resolution) both modified: .gitignore both modified: mk/dependencies/deps.lock both modified: mk/dependencies/k3d.sh both modified: mk/k3d.mk ``` --------- Signed-off-by: Mike Beaumont <[email protected]> Signed-off-by: slonka <[email protected]> Co-authored-by: Mike Beaumont <[email protected]> Co-authored-by: slonka <[email protected]>
- Loading branch information
1 parent
6420c84
commit e7c9b51
Showing
5 changed files
with
23 additions
and
3,764 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
8833e8be9eeeee4903952db5e738daf19645c938 | ||
b7ed391a41482e10d356d722a0d99e1dd4537b95 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,14 @@ | ||
#!/bin/bash | ||
#!/usr/bin/env bash | ||
|
||
set -e | ||
|
||
OUTPUT_DIR=$1/bin | ||
VERSION="5.4.7" | ||
# see https://raw.githubusercontent.com/rancher/k3d/main/install.sh | ||
curl --fail --location -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | \ | ||
PATH=${OUTPUT_DIR}:${PATH} TAG=v${VERSION} USE_SUDO="false" K3D_INSTALL_DIR="${OUTPUT_DIR}" bash | ||
|
||
if [[ $2 == "get-version" ]]; then | ||
echo ${VERSION} | ||
else | ||
# see https://raw.githubusercontent.com/rancher/k3d/main/install.sh | ||
curl --fail --location -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | \ | ||
PATH=${OUTPUT_DIR}:${PATH} TAG=v${VERSION} USE_SUDO="false" K3D_INSTALL_DIR="${OUTPUT_DIR}" bash | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.